[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
This commit is contained in:
Mikhail Timofeev
2021-03-16 17:16:16 +03:00
committed by GitHub
parent ef6e8c905f
commit 0cf21e4512
3 changed files with 40 additions and 49 deletions

View File

@@ -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 "(?<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