Skip to content

Commit c72de0c

Browse files
kishorekumar-anchalakishorekumar-anchala
committedMar 19, 2025
Update sbt version check
[macOS] Xcode 16.3 beta 2 - WatchOS tvOS version update (actions#11783) * iOS 22E5216h * Use build number for the beta VisionOS simulator * watchOS tvOS update --------- Co-authored-by: Pavel Iakovenko <[email protected]> Co-authored-by: ijunaidm1 <[email protected]> Fix dotnet failure Fix PR checks Updating readme file for macos-13 version 20250311.806 (actions#11780) Co-authored-by: Image generation service account. <[email protected]> Co-authored-by: Actions service account <[email protected]> Updating readme file for macos-13-arm64 version 20250311.898 (actions#11778) Co-authored-by: Image generation service account. <[email protected]> Co-authored-by: Actions service account <[email protected]> Fix Ubuntu 20 failure by pinning supported gems (actions#11793) Update WSL2 signature for windows 2025 Fix Pull request checks Update SoftwareReport.Nodes.psm1 Update SoftwareReport.Nodes.Unit.Tests.ps1 Update SoftwareReport.Nodes.Unit.Tests.ps1 to fix PR checks Fix PR checks Rollback code Update SoftwareReport.Common.psm1 Update SoftwareReport.Nodes.Unit.Tests.ps1 Update SoftwareReport.Nodes.Unit.Tests.ps1
1 parent 3c3efb2 commit c72de0c

File tree

8 files changed

+65
-45
lines changed

8 files changed

+65
-45
lines changed
 

‎helpers/software-report-base/SoftwareReport.Nodes.psm1

+5-2
Original file line numberDiff line numberDiff line change
@@ -254,9 +254,12 @@ class ToolVersionsListNode: BaseToolNode {
254254
}
255255

256256
hidden [void] ValidateMajorVersionRegex() {
257-
$this.Versions | Group-Object { $this.ExtractMajorVersion($_) } | ForEach-Object {
257+
$this.Versions | Group-Object {
258+
$majorVersion = $this.ExtractMajorVersion($_)
259+
"$majorVersion|$($_ -replace '^.*\.(\d+)$','$1')"
260+
} | ForEach-Object {
258261
if ($_.Count -gt 1) {
259-
throw "Multiple versions from list '$($this.GetValue())' return the same result from regex '$($this.MajorVersionRegex)': $($_.Name)"
262+
throw "Multiple versions from list '$($this.Versions -join ', ')' return the same result from regex '$($this.MajorVersionRegex)': $($_.Name)"
260263
}
261264
}
262265
}

‎helpers/software-report-base/tests/SoftwareReport.Nodes.Unit.Tests.ps1

+5-5
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ Describe "Nodes.UnitTests" {
9898
{ [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.*'
9999
{ [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw '*Exception setting "Versions": "The argument is null or empty.*'
100100
{ [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @(); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw '*Exception setting "Versions": "The argument is null, empty,*'
101-
{ [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 *'
101+
{ [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", '2.2.4','2.2.4'); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Throw 'Multiple versions from list * return the same result from regex *'
102102
{ [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = ""; ListType = "List" }) } | Should -Throw 'Version * doesn''t match regex *'
103103
{ [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*'
104104
{ [ToolVersionsListNode]::FromJsonObject(@{ NodeType = "ToolVersionsListNode"; ToolName = "MyTool"; Versions = @("2.1.3", "3.1.4"); MajorVersionRegex = "^\d+"; ListType = "List" }) } | Should -Not -Throw
@@ -151,7 +151,7 @@ Describe "Nodes.UnitTests" {
151151
}
152152

153153
It "Major version regex - non-unique versions" {
154-
{ [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 *"
154+
{ [ToolVersionsListNode]::new("MyTool", @("2.1.3", "3.1.5", "3.1.5", "3.2.0", "4.0.0"), "^\d+", "List") } | Should -Throw "Multiple versions from list * return the same result from regex *"
155155
}
156156

157157
It "Minor version regex - unique versions" {
@@ -160,7 +160,7 @@ Describe "Nodes.UnitTests" {
160160
}
161161

162162
It "Minor version regex - non-unique versions" {
163-
{ [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 *"
163+
{ [ToolVersionsListNode]::new("MyTool", @("2.1.3", "2.1.4", "3.1.2", "3.1.2"), "^\d+\.\d+", "List") } | Should -Throw "Multiple versions from list * return the same result from regex *"
164164
}
165165

166166
It "Patch version regex - unique versions" {
@@ -178,7 +178,7 @@ Describe "Nodes.UnitTests" {
178178
}
179179

180180
It ".NET Core version regex - non-unique versions" {
181-
{ [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 *"
181+
{ [ToolVersionsListNode]::new("MyTool", @("2.1.100", "2.1.205", "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 *"
182182
}
183183
}
184184
}
@@ -508,4 +508,4 @@ Good Bye world
508508
}
509509
}
510510
}
511-
}
511+
}

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

+20-18
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
# macOS 13
88
- OS Version: macOS 13.7.4 (22H420)
99
- Kernel Version: Darwin 22.6.0
10-
- Image Version: 20250303.763
10+
- Image Version: 20250311.806
1111

1212
## Installed Software
1313

1414
### Language and Runtime
15-
- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.406, 9.0.102, 9.0.200
15+
- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.407, 9.0.102, 9.0.201
1616
- Bash 3.2.57(1)-release
1717
- Clang/LLVM 14.0.0
1818
- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
@@ -35,13 +35,13 @@
3535
- Carthage 0.40.0
3636
- CocoaPods 1.16.2
3737
- Composer 2.8.6
38-
- Homebrew 4.4.22
38+
- Homebrew 4.4.24
3939
- NPM 10.8.2
4040
- NuGet 6.3.1.1
4141
- Pip3 25.0.1 (python 3.13)
4242
- Pipx 1.7.1
4343
- RubyGems 3.6.5
44-
- Vcpkg 2025 (build from commit efb1e74369)
44+
- Vcpkg 2025 (build from commit c14d623871)
4545
- Yarn 1.22.22
4646

4747
### Project Management
@@ -59,23 +59,24 @@
5959
- Curl 8.12.1
6060
- Git 2.48.1
6161
- Git LFS 3.6.1
62-
- GitHub CLI 2.67.0
62+
- GitHub CLI 2.68.1
6363
- GNU Tar 1.35 - available by 'gtar' alias
6464
- GNU Wget 1.25.0
6565
- gpg (GnuPG) 2.4.7
6666
- jq 1.7.1
6767
- OpenSSL 1.1.1w 11 Sep 2023
6868
- Packer 1.12.0
69-
- pkgconf 2.3.0
69+
- pkgconf 2.4.3
7070
- Unxip 3.1
7171
- yq 4.45.1
7272
- zstd 1.5.7
73+
- Ninja 1.12.1
7374

7475
### Tools
75-
- AWS CLI 2.24.15
76-
- AWS SAM CLI 1.134.0
76+
- AWS CLI 2.24.21
77+
- AWS SAM CLI 1.135.0
7778
- AWS Session Manager CLI 1.2.707.0
78-
- Azure CLI 2.69.0
79+
- Azure CLI 2.70.0
7980
- Azure CLI (azure-devops) 1.0.1
8081
- Bicep CLI 0.33.93
8182
- Cmake 3.31.6
@@ -92,12 +93,12 @@
9293
### Browsers
9394
- Safari 18.3 (18620.2.4.111.8)
9495
- SafariDriver 18.3 (18620.2.4.111.8)
95-
- Google Chrome 133.0.6943.142
96-
- Google Chrome for Testing 133.0.6943.141
97-
- ChromeDriver 133.0.6943.141
98-
- Microsoft Edge 133.0.3065.92
99-
- Microsoft Edge WebDriver 133.0.3065.92
100-
- Mozilla Firefox 135.0.1
96+
- Google Chrome 134.0.6998.89
97+
- Google Chrome for Testing 134.0.6998.88
98+
- ChromeDriver 134.0.6998.88
99+
- Microsoft Edge 134.0.3124.51
100+
- Microsoft Edge WebDriver 134.0.3124.51
101+
- Mozilla Firefox 136.0.1
101102
- geckodriver 0.36.0
102103
- Selenium server 4.29.0
103104

@@ -147,13 +148,14 @@
147148
#### Go
148149
- 1.21.13
149150
- 1.22.12
150-
- 1.23.6
151+
- 1.23.7
152+
- 1.24.1
151153

152154
### Rust Tools
153155
- Cargo 1.85.0
154156
- Rust 1.85.0
155157
- Rustdoc 1.85.0
156-
- Rustup 1.27.1
158+
- Rustup 1.28.1
157159

158160
#### Packages
159161
- Clippy 0.1.85
@@ -243,7 +245,7 @@
243245
| Package Name | Version |
244246
| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
245247
| Android Command Line Tools | 11.0 |
246-
| Android Emulator | 35.3.12 |
248+
| Android Emulator | 35.4.9 |
247249
| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.2 33.0.3 |
248250
| 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) |
249251
| Android SDK Platform-Tools | 35.0.2 |

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

+16-14
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
# macOS 13
88
- OS Version: macOS 13.7.4 (22H420)
99
- Kernel Version: Darwin 22.6.0
10-
- Image Version: 20250303.855
10+
- Image Version: 20250311.898
1111

1212
## Installed Software
1313

1414
### Language and Runtime
15-
- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.406, 9.0.102, 9.0.200
15+
- .NET Core SDK: 8.0.101, 8.0.204, 8.0.303, 8.0.407, 9.0.102, 9.0.201
1616
- Bash 3.2.57(1)-release
1717
- Clang/LLVM 14.0.0
1818
- Clang/LLVM (Homebrew) 15.0.7 - available on `$(brew --prefix llvm@15)/bin/clang`
@@ -33,7 +33,7 @@
3333
- Bundler 2.6.5
3434
- Carthage 0.40.0
3535
- CocoaPods 1.16.2
36-
- Homebrew 4.4.22
36+
- Homebrew 4.4.24
3737
- NPM 10.8.2
3838
- NuGet 6.3.1.1
3939
- Pip3 25.0 (python 3.13)
@@ -56,23 +56,24 @@
5656
- Curl 8.7.1
5757
- Git 2.48.1
5858
- Git LFS 3.6.1
59-
- GitHub CLI 2.67.0
59+
- GitHub CLI 2.68.1
6060
- GNU Tar 1.35 - available by 'gtar' alias
6161
- GNU Wget 1.25.0
6262
- gpg (GnuPG) 2.4.7
6363
- jq 1.7.1
6464
- OpenSSL 1.1.1w 11 Sep 2023
6565
- Packer 1.12.0
66-
- pkgconf 2.3.0
66+
- pkgconf 2.4.3
6767
- Unxip 3.1
6868
- yq 4.45.1
6969
- zstd 1.5.7
70+
- Ninja 1.12.1
7071

7172
### Tools
72-
- AWS CLI 2.24.15
73-
- AWS SAM CLI 1.134.0
73+
- AWS CLI 2.24.21
74+
- AWS SAM CLI 1.135.0
7475
- AWS Session Manager CLI 1.2.707.0
75-
- Azure CLI 2.69.0
76+
- Azure CLI 2.70.0
7677
- Azure CLI (azure-devops) 1.0.1
7778
- Bicep CLI 0.33.93
7879
- Cmake 3.31.6
@@ -88,9 +89,9 @@
8889
### Browsers
8990
- Safari 18.3 (18620.2.4.111.8)
9091
- SafariDriver 18.3 (18620.2.4.111.8)
91-
- Google Chrome 133.0.6943.142
92-
- Google Chrome for Testing 133.0.6943.141
93-
- ChromeDriver 133.0.6943.141
92+
- Google Chrome 134.0.6998.89
93+
- Google Chrome for Testing 134.0.6998.88
94+
- ChromeDriver 134.0.6998.88
9495
- Selenium server 4.29.0
9596

9697
#### Environment variables
@@ -128,13 +129,14 @@
128129
#### Go
129130
- 1.21.13
130131
- 1.22.12
131-
- 1.23.6
132+
- 1.23.7
133+
- 1.24.1
132134

133135
### Rust Tools
134136
- Cargo 1.85.0
135137
- Rust 1.85.0
136138
- Rustdoc 1.85.0
137-
- Rustup 1.27.1
139+
- Rustup 1.28.1
138140

139141
#### Packages
140142
- Clippy 0.1.85
@@ -225,7 +227,7 @@
225227
| Package Name | Version |
226228
| -------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
227229
| Android Command Line Tools | 11.0 |
228-
| Android Emulator | 35.3.12 |
230+
| Android Emulator | 35.4.9 |
229231
| Android SDK Build-tools | 35.0.0 35.0.1<br>34.0.0<br>33.0.2 33.0.3 |
230232
| 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) |
231233
| Android SDK Platform-Tools | 35.0.2 |

‎images/macos/toolsets/toolset-15.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
"install_runtimes":
99
[
1010
"iOS -buildVersion 18.0", "iOS -buildVersion 18.1", "iOS -buildVersion 18.2", "iOS -buildVersion 18.3.1", "iOS -buildVersion 22E5216h",
11-
"watchOS",
12-
"tvOS"
11+
"watchOS -buildVersion 11.0", "watchOS -buildVersion 11.1", "watchOS -buildVersion 11.2", "watchOS -buildVersion 22T5212l",
12+
"tvOS -buildVersion 18.0", "tvOS -buildVersion 18.1", "tvOS -buildVersion 18.2", "tvOS -buildVersion 22L5218l"
1313
],
1414
"sha256": "f4bb80c2e93d3561ecbabc82d1a92c830d831c96afc48944baa8116e3fd0013d"
1515
},
@@ -28,8 +28,8 @@
2828
"install_runtimes":
2929
[
3030
"iOS -buildVersion 18.0", "iOS -buildVersion 18.1", "iOS -buildVersion 18.2", "iOS -buildVersion 18.3.1", "iOS -buildVersion 22E5216h",
31-
"watchOS",
32-
"tvOS",
31+
"watchOS -buildVersion 11.0", "watchOS -buildVersion 11.1", "watchOS -buildVersion 11.2", "watchOS -buildVersion 22T5212l",
32+
"tvOS -buildVersion 18.0", "tvOS -buildVersion 18.1", "tvOS -buildVersion 18.2", "tvOS -buildVersion 22L5218l",
3333
"visionOS -buildVersion 2.0", "visionOS -buildVersion 2.1", "visionOS -buildVersion 2.2", "visionOS -buildVersion 2.3", "visionOS -buildVersion 22O5215f"
3434
],
3535
"sha256": "f4bb80c2e93d3561ecbabc82d1a92c830d831c96afc48944baa8116e3fd0013d"

‎images/ubuntu/scripts/build/install-ruby.sh

+13
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,23 @@ apt-get install ruby-full
1212

1313
# temporary fix for fastlane installation https://github.com/sporkmonger/addressable/issues/541
1414
if is_ubuntu20; then
15+
1516
gem install public_suffix -v 5.1.1
1617

1718
# Install google-cloud-errors gem pinned to version 1.4.0
1819
gem install google-cloud-errors -v 1.4.0
20+
21+
# Install faraday-net_http gem pinned to version 3.0.2
22+
gem install faraday-net_http -v 3.0.2
23+
24+
# Install faraday gem pinned to version 2.8.1
25+
gem install faraday -v 2.8.1
26+
27+
# Install google-cloud-env gem pinned to version 2.1.1
28+
gem install google-cloud-env -v 2.1.1
29+
30+
# Install google-cloud-core gem pinned to version 1.7.1
31+
gem install google-cloud-core -v 1.7.1
1932
fi
2033

2134
# Install ruby gems from toolset

‎images/windows/scripts/build/Install-WSL2.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl `
88

99
Install-Binary -Type MSI `
1010
-Url $downloadUrl `
11-
-ExpectedSHA256Sum "3CC2866BE450210BDD7A7449DF96E0B1EAE25067EE348631A5B9BFC62C943740"
11+
-ExpectedSHA256Sum "5A890C175A6A56ABE5D3D98AABD65E90023AAB18ACA4619390B6338A89CE1DDF"
1212

1313
Write-Host "Performing wsl --install --no-distribution"
1414
wsl.exe --install --no-distribution

‎images/windows/scripts/docs-gen/SoftwareReport.Common.psm1

+1-1
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ function Get-GradleVersion {
166166
}
167167

168168
function Get-SbtVersion {
169-
(sbt -version) -match "sbt script" | Get-StringPart -Part 3
169+
(sbt -version) -match "sbt runner" | Get-StringPart -Part 3
170170
}
171171

172172
function Get-DotnetSdks {

0 commit comments

Comments
 (0)
Please sign in to comment.