-
Notifications
You must be signed in to change notification settings - Fork 865
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Added capability detection for JDK/JRE >=9 as 'java'/'JDK' capabiliti…
…es (#3381) * Added ability to detect JDK/JRE >= 9 as jdk/java capabilities * Additional amendments * Added knob to disable new behavior Added check for additional registry keys * Fix variable name * Fix formatting * Change Knob description * Resolve review comments Co-authored-by: Nikita Ezzhev <[email protected]>
- Loading branch information
1 parent
67cd9bb
commit 936a65c
Showing
6 changed files
with
209 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -172,4 +172,4 @@ function Get-RegistryValueNames { | |
$null = $baseKey.Dispose() | ||
} | ||
} | ||
} | ||
} |
25 changes: 25 additions & 0 deletions
25
src/Misc/layoutbin/powershell/CapabilityHelpers/VersionFunctions.ps1
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
function Parse-Version { | ||
<# | ||
.SYNOPSIS | ||
Parses version from provided. Allows incomplete versions like 16.0. Returns empty string if there is more than 4 numbers divided by dot or string is not in semver format | ||
.EXAMPLE | ||
Parse-Version -Version "1.3.5" | ||
#> | ||
[CmdletBinding()] | ||
param( | ||
[Parameter(Mandatory = $true)] | ||
[string]$Version) | ||
|
||
if ($Version.IndexOf(".") -lt 0) { | ||
return [System.Version]::Parse("$($Version).0") | ||
} | ||
try { | ||
$res = [System.Version]::Parse($Version) | ||
|
||
return $res | ||
} catch { | ||
return "" | ||
} | ||
} |