mirror of
https://github.com/actions/runner-images.git
synced 2025-12-11 03:27:05 +00:00
[Windows] Update WSL2 signature, Sbt version check and Regex Handling for Major Versions (#11833)
* [Windows] Fix Dotnet, sbt, wsl2 errors on windows * [Windows] rollback scripts changes
This commit is contained in:
committed by
GitHub
parent
88c7661ae2
commit
55bacf67db
@@ -436,4 +436,4 @@ class NoteNode: BaseNode {
|
||||
[Boolean] IsIdenticalTo([BaseNode] $OtherNode) {
|
||||
return $this.IsSimilarTo($OtherNode)
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -8,7 +8,7 @@ $downloadUrl = Resolve-GithubReleaseAssetUrl `
|
||||
|
||||
Install-Binary -Type MSI `
|
||||
-Url $downloadUrl `
|
||||
-ExpectedSHA256Sum "3CC2866BE450210BDD7A7449DF96E0B1EAE25067EE348631A5B9BFC62C943740"
|
||||
-ExpectedSHA256Sum "5A890C175A6A56ABE5D3D98AABD65E90023AAB18ACA4619390B6338A89CE1DDF"
|
||||
|
||||
Write-Host "Performing wsl --install --no-distribution"
|
||||
wsl.exe --install --no-distribution
|
||||
|
||||
@@ -221,7 +221,7 @@ 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 Core SDK", $(Get-DotnetSdks).Versions, '^\d+\.\d+\.\d{3}')
|
||||
}
|
||||
$netCoreTools.AddToolVersionsListInline(".NET Framework", $(Get-DotnetFrameworkVersions), '^.+')
|
||||
Get-DotnetRuntimes | ForEach-Object {
|
||||
|
||||
@@ -166,7 +166,7 @@ function Get-GradleVersion {
|
||||
}
|
||||
|
||||
function Get-SbtVersion {
|
||||
(sbt -version) -match "sbt script" | Get-StringPart -Part 3
|
||||
(sbt -version) -match "sbt runner" | Get-StringPart -Part 3
|
||||
}
|
||||
|
||||
function Get-DotnetSdks {
|
||||
|
||||
Reference in New Issue
Block a user