actions/runner-images
1
0
Fork 0
mirror of https://github.com/actions/runner-images.git synced 2025-12-11 03:27:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Windows] Update WSL2 signature, Sbt version check and Regex Handling for Major Versions (#11833)

Browse Source 
* [Windows] Fix Dotnet, sbt, wsl2 errors on windows

* [Windows] rollback scripts changes
This commit is contained in:
kishorekumar-anchala
2025-03-19 17:04:20 +00:00
committed by GitHub
parent 88c7661ae2
commit 55bacf67db
4 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
helpers/software-report-base/SoftwareReport.Nodes.psm1
View File

@@ -436,4 +436,4 @@ class NoteNode: BaseNode {
[Boolean] IsIdenticalTo([BaseNode] $OtherNode) { [Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
return $this.IsSimilarTo($OtherNode) return $this.IsSimilarTo($OtherNode)
} }
} }

2
images/windows/scripts/build/Install-WSL2.ps1
View File

@@ -8,7 +8,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl `
Install-Binary -Type MSI ` Install-Binary -Type MSI `
-Url $downloadUrl ` -Url $downloadUrl `
-ExpectedSHA256Sum "3CC2866BE450210BDD7A7449DF96E0B1EAE25067EE348631A5B9BFC62C943740" -ExpectedSHA256Sum "5A890C175A6A56ABE5D3D98AABD65E90023AAB18ACA4619390B6338A89CE1DDF"
Write-Host "Performing wsl --install --no-distribution" Write-Host "Performing wsl --install --no-distribution"
wsl.exe --install --no-distribution wsl.exe --install --no-distribution

2
images/windows/scripts/docs-gen/Generate-SoftwareReport.ps1
View File

@@ -221,7 +221,7 @@ if (Test-IsWin19) {
# Visual Studio 2019 brings own version of .NET Core which is different from latest official version # 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}') $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetSdks).Versions, '^\d+\.\d+\.\d{2}')
} else { } else {
$netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetSdks).Versions, '^\d+\.\d+\.\d') $netCoreTools.AddToolVersionsListInline(".NET Core SDK", $(Get-DotnetSdks).Versions, '^\d+\.\d+\.\d{3}')
} }
$netCoreTools.AddToolVersionsListInline(".NET Framework", $(Get-DotnetFrameworkVersions), '^.+') $netCoreTools.AddToolVersionsListInline(".NET Framework", $(Get-DotnetFrameworkVersions), '^.+')
Get-DotnetRuntimes | ForEach-Object { Get-DotnetRuntimes | ForEach-Object {

2
images/windows/scripts/docs-gen/SoftwareReport.Common.psm1
View File

@@ -166,7 +166,7 @@ function Get-GradleVersion {
} }
function Get-SbtVersion { function Get-SbtVersion {
(sbt -version) -match "sbt script" | Get-StringPart -Part 3 (sbt -version) -match "sbt runner" | Get-StringPart -Part 3
} }
function Get-DotnetSdks { function Get-DotnetSdks {