Skip to content

Commit e92651c

Browse files
Merge remote-tracking branch 'upstream/main' into macos-arm64-pipx
2 parents 71573ff + 9364162 commit e92651c

File tree

4 files changed

+59
-53
lines changed

4 files changed

+59
-53
lines changed

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ fi
1818
common_packages=$(get_toolset_value '.brew.common_packages[]')
1919
for package in $common_packages; do
2020
echo "Installing $package..."
21-
brew_smart_install "$package"
21+
if is_Monterey && [[ $package == "xcbeautify" ]]; then
22+
# Pin the version on Monterey as 2.0.x requires Xcode >=15.0 which is not available on OS12
23+
xcbeautify_path=$(download_with_retry "https://raw.githubusercontent.com/Homebrew/homebrew-core/d3653e83f9c029a3fddb828ac804b07ac32f7b3b/Formula/x/xcbeautify.rb")
24+
brew install "$xcbeautify_path"
25+
else
26+
brew_smart_install "$package"
27+
fi
2228
done
2329

2430
cask_packages=$(get_toolset_value '.brew.cask_packages[]')

images/ubuntu/Ubuntu2004-Readme.md

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
***
77
# Ubuntu 20.04
88
- OS Version: 20.04.6 LTS
9-
- Kernel Version: 5.15.0-1057-azure
10-
- Image Version: 20240304.1.0
9+
- Kernel Version: 5.15.0-1058-azure
10+
- Image Version: 20240310.1.0
1111
- Systemd version: 245.4-4ubuntu3.23
1212

1313
## Installed Software
@@ -23,14 +23,14 @@
2323
- GNU C++: 9.4.0, 10.5.0
2424
- GNU Fortran: 9.4.0, 10.5.0
2525
- Julia 1.10.2
26-
- Kotlin 1.9.22-release-704
26+
- Kotlin 1.9.23-release-779
2727
- Mono 6.12.0.200
2828
- MSBuild 16.10.1.31701 (Mono 6.12.0.200)
2929
- Node.js 18.19.1
3030
- Perl 5.30.0
3131
- Python 3.8.10
3232
- Ruby 2.7.0p0
33-
- Swift 5.9.2
33+
- Swift 5.10
3434

3535
### Package Management
3636
- cpan 1.64
@@ -43,8 +43,8 @@
4343
- Pip3 20.0.2
4444
- Pipx 1.4.3
4545
- RubyGems 3.1.2
46-
- Vcpkg (build from commit 215a25355)
47-
- Yarn 1.22.21
46+
- Vcpkg (build from commit 0719a7138)
47+
- Yarn 1.22.22
4848

4949
#### Environment variables
5050
| Name | Value |
@@ -80,12 +80,12 @@ to accomplish this.
8080
- Docker Amazon ECR Credential Helper 0.7.1
8181
- Docker Compose v1 1.29.2
8282
- Docker Compose v2 2.23.3
83-
- Docker-Buildx 0.12.1
83+
- Docker-Buildx 0.13.0
8484
- Docker Client 24.0.9
8585
- Docker Server 24.0.9
8686
- Fastlane 2.219.0
8787
- Git 2.43.2
88-
- Git LFS 3.4.1
88+
- Git LFS 3.5.1
8989
- Git-ftp 1.6.0
9090
- Haveged 1.9.1
9191
- Heroku 8.10.0
@@ -102,11 +102,11 @@ to accomplish this.
102102
- Newman 6.1.1
103103
- nvm 0.39.7
104104
- OpenSSL 1.1.1f-1ubuntu2.22
105-
- Packer 1.10.1
105+
- Packer 1.10.2
106106
- Parcel 2.12.0
107107
- PhantomJS 2.1.1 2.1.1
108108
- Podman 3.4.2
109-
- Pulumi 3.108.1
109+
- Pulumi 3.109.0
110110
- R 4.3.3
111111
- Skopeo 1.5.0
112112
- Sphinx Open Source Search Server 2.2.11
@@ -118,17 +118,17 @@ to accomplish this.
118118

119119
### CLI Tools
120120
- Alibaba Cloud CLI 3.0.174
121-
- AWS CLI 2.15.25
121+
- AWS CLI 2.15.27
122122
- AWS CLI Session Manager Plugin 1.2.553.0
123-
- AWS SAM CLI 1.110.0
124-
- Azure CLI 2.57.0
123+
- AWS SAM CLI 1.111.0
124+
- Azure CLI 2.58.0
125125
- Azure CLI (azure-devops) 1.0.0
126126
- GitHub CLI 2.45.0
127-
- Google Cloud CLI 466.0.0
128-
- Netlify CLI 17.17.2
127+
- Google Cloud CLI 467.0.0
128+
- Netlify CLI 17.19.0
129129
- OpenShift CLI 4.15.0
130130
- ORAS CLI 1.1.0
131-
- Vercel CLI 33.5.3
131+
- Vercel CLI 33.5.5
132132

133133
### Java
134134
| Version | Environment Variable |
@@ -139,9 +139,9 @@ to accomplish this.
139139
| 21.0.2+13 | JAVA_HOME_21_X64 |
140140

141141
### PHP Tools
142-
- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.15, 8.3.3
142+
- PHP: 7.4.33, 8.0.30, 8.1.27, 8.2.16, 8.3.3
143143
- Composer 2.7.1
144-
- PHPUnit 8.5.36
144+
- PHPUnit 8.5.37
145145
```
146146
Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.
147147
```
@@ -150,7 +150,7 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.
150150
- Cabal 3.10.2.1
151151
- GHC 9.8.2
152152
- GHCup 0.1.20.0
153-
- Stack 2.15.1
153+
- Stack 2.15.3
154154

155155
### Rust Tools
156156
- Cargo 1.76.0
@@ -167,11 +167,11 @@ Both Xdebug and PCOV extensions are installed, but only Xdebug is enabled.
167167
- Rustfmt 1.7.0
168168

169169
### Browsers and Drivers
170-
- Google Chrome 122.0.6261.94
171-
- ChromeDriver 122.0.6261.94
170+
- Google Chrome 122.0.6261.111
171+
- ChromeDriver 122.0.6261.111
172172
- Chromium 122.0.6261.0
173-
- Microsoft Edge 122.0.2365.63
174-
- Microsoft Edge WebDriver 122.0.2365.63
173+
- Microsoft Edge 122.0.2365.80
174+
- Microsoft Edge WebDriver 122.0.2365.80
175175
- Selenium server 4.18.1
176176
- Mozilla Firefox 123.0.1
177177
- Geckodriver 0.34.0
@@ -217,8 +217,8 @@ Use the following command as a part of your job to start the service: 'sudo syst
217217

218218
#### Go
219219
- 1.20.14
220-
- 1.21.7
221-
- 1.22.0
220+
- 1.21.8
221+
- 1.22.1
222222

223223
#### Node.js
224224
- 16.20.2
@@ -254,7 +254,7 @@ Use the following command as a part of your job to start the service: 'sudo syst
254254
- MarkdownPS: 1.9
255255
- Microsoft.Graph: 2.15.0
256256
- Pester: 5.5.0
257-
- PSScriptAnalyzer: 1.21.0
257+
- PSScriptAnalyzer: 1.22.0
258258

259259
### Web Servers
260260
| 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
294294
| debian:10 | sha256:a52d4e1c201d9ab2f3b939b91a3fdd345d3d11404755bc1cdb22c1d5be131c5d | 2024-02-13 |
295295
| debian:11 | sha256:171478fbe347a3cfe45058dae333b6ed848fd8ce89f3104c89fa94c245086db1 | 2024-02-13 |
296296
| debian:9 | sha256:c5c5200ff1e9c73ffbf188b4a67eb1c91531b644856b4aefe86a58d2f0cb05be | 2022-06-23 |
297-
| moby/buildkit:latest | sha256:449188623c7a8a3bd4f161c5d0ddf5cabbfb828f7eaadf9ed8111864b911a308 | 2024-01-31 |
297+
| moby/buildkit:latest | sha256:24fddad8ce5063e822f32df151b5d7c0b060a850e680bed615ccf9162eabf6e3 | 2024-03-05 |
298298
| node:16 | sha256:f77a1aef2da8d83e45ec990f45df50f1a286c5fe8bbfb8c6e4246c6389705c0b | 2023-09-07 |
299299
| node:16-alpine | sha256:a1f9d027912b58a7c75be7716c97cfbc6d3099f3a97ed84aa490be9dee20e787 | 2023-08-10 |
300300
| node:18 | sha256:aa329c613f0067755c0787d2a3a9802c7d95eecdb927d62b910ec1d28689882f | 2024-02-15 |
301301
| node:18-alpine | sha256:ca9f6cb0466f9638e59e0c249d335a07c867cd50c429b5c7830dda1bed584649 | 2024-02-15 |
302302
| node:20 | sha256:f3299f16246c71ab8b304d6745bb4059fa9283e8d025972e28436a9f9b36ed24 | 2024-02-15 |
303303
| node:20-alpine | sha256:c0a3badbd8a0a760de903e00cedbca94588e609299820557e72cba2a53dbaa2c | 2024-02-15 |
304-
| ubuntu:20.04 | sha256:bb1c41682308d7040f74d103022816d41c50d7b0c89e9d706a74b4e548636e54 | 2024-01-23 |
304+
| ubuntu:20.04 | sha256:80ef4a44043dec4490506e6cc4289eeda2d106a70148b74b5ae91ee670e9c35d | 2024-02-16 |
305305

306306
### Installed apt packages
307307
| Name | Version |

images/windows/Windows2019-Readme.md

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
***
77
# Windows Server 2019
88
- OS Version: 10.0.17763 Build 5458
9-
- Image Version: 20240304.2.0
9+
- Image Version: 20240310.1.0
1010

1111
## Windows features
1212
- Windows Subsystem for Linux (WSLv1): Enabled
@@ -15,9 +15,9 @@
1515

1616
### Language and Runtime
1717
- Bash 5.2.26(1)-release
18-
- Go 1.21.7
19-
- Julia 1.10.0
20-
- Kotlin 1.9.22
18+
- Go 1.21.8
19+
- Julia 1.10.2
20+
- Kotlin 1.9.23
2121
- LLVM 16.0.6
2222
- Node 18.18.2
2323
- Perl 5.32.1
@@ -35,8 +35,8 @@
3535
- pip 24.0 (python 3.7)
3636
- Pipx 1.2.1
3737
- RubyGems 3.2.33
38-
- Vcpkg (build from commit 215a25355)
39-
- Yarn 1.22.21
38+
- Vcpkg (build from commit 0719a7138)
39+
- Yarn 1.22.22
4040

4141
#### Environment variables
4242
| Name | Value |
@@ -67,7 +67,7 @@
6767
- ghc 9.8.2
6868
- Git 2.44.0.windows.1
6969
- Git LFS 3.4.1
70-
- Google Cloud CLI 466.0.0
70+
- Google Cloud CLI 467.0.0
7171
- ImageMagick 7.1.1-29
7272
- InnoSetup 6.2.2
7373
- jq 1.7.1
@@ -82,10 +82,10 @@
8282
- OpenSSL 1.1.1w
8383
- Packer 1.10.0
8484
- Parcel 2.12.0
85-
- Pulumi 3.108.1
85+
- Pulumi 3.109.0
8686
- R 4.3.2
8787
- Service Fabric SDK 9.1.1436.9590
88-
- Stack 2.15.1
88+
- Stack 2.15.3
8989
- Subversion (SVN) 1.14.2
9090
- Swig 4.1.1
9191
- VSWhere 3.1.7
@@ -95,11 +95,11 @@
9595
- zstd 1.5.5
9696

9797
### CLI Tools
98-
- Alibaba Cloud CLI 3.0.198
99-
- AWS CLI 2.15.25
100-
- AWS SAM CLI 1.110.0
98+
- Alibaba Cloud CLI 3.0.199
99+
- AWS CLI 2.15.27
100+
- AWS SAM CLI 1.111.0
101101
- AWS Session Manager CLI 1.2.553.0
102-
- Azure CLI 2.57.0
102+
- Azure CLI 2.58.0
103103
- Azure DevOps CLI extension 1.0.0
104104
- Cloud Foundry CLI 6.53.0
105105
- GitHub CLI 2.45.0
@@ -119,11 +119,11 @@
119119
- Rustfmt 1.7.0
120120

121121
### Browsers and Drivers
122-
- Google Chrome 122.0.6261.95
123-
- Chrome Driver 122.0.6261.94
124-
- Microsoft Edge 122.0.2365.66
125-
- Microsoft Edge Driver 122.0.2365.66
126-
- Mozilla Firefox 123.0
122+
- Google Chrome 122.0.6261.112
123+
- Chrome Driver 122.0.6261.111
124+
- Microsoft Edge 122.0.2365.80
125+
- Microsoft Edge Driver 122.0.2365.80
126+
- Mozilla Firefox 123.0.1
127127
- Gecko Driver 0.34.0
128128
- IE Driver 4.14.0.0
129129
- Selenium server 4.18.0
@@ -168,8 +168,8 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
168168

169169
#### Go
170170
- 1.20.14
171-
- 1.21.7
172-
- 1.22.0
171+
- 1.21.8
172+
- 1.22.1
173173

174174
#### Node.js
175175
- 16.20.2
@@ -213,7 +213,7 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
213213
#### MongoDB
214214
| Version | ServiceName | ServiceStatus | ServiceStartType |
215215
| -------- | ----------- | ------------- | ---------------- |
216-
| 5.0.24.0 | MongoDB | Stopped | Disabled |
216+
| 5.0.25.0 | MongoDB | Stopped | Disabled |
217217

218218
### Database tools
219219
- Azure CosmosDb Emulator 2.14.16.0
@@ -511,13 +511,13 @@ Note: MSYS2 is pre-installed on image but not added to PATH.
511511
- 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
512512
- Azure (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip
513513
- AzureRM (Cached): 3.8.0.zip, 4.2.1.zip, 5.1.1.zip, 6.7.0.zip
514-
- AWSPowershell: 4.1.528
514+
- AWSPowershell: 4.1.533
515515
- DockerMsftProvider: 1.0.0.8
516516
- MarkdownPS: 1.9
517517
- Microsoft.Graph: 2.15.0
518518
- Pester: 3.4.0, 5.5.0
519519
- PowerShellGet: 1.0.0.1, 2.2.5
520-
- PSScriptAnalyzer: 1.21.0
520+
- PSScriptAnalyzer: 1.22.0
521521
- PSWindowsUpdate: 2.2.1.4
522522
- SqlServer: 22.2.0
523523
- VSSetup: 2.2.16

images/windows/toolsets/toolset-2022.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@
176176
"subversion" : "17",
177177
"edition" : "Enterprise",
178178
"channel": "release",
179-
"signature": "F9A7CF9FBE13BAC767F4781061332DA6E8B4E0EE",
179+
"signature": "C2048FB509F1C37A8C3E9EC6648118458AA01780",
180180
"workloads": [
181181
"Component.Dotfuscator",
182182
"Component.Linux.CMake",

0 commit comments

Comments
 (0)