Skip to content

Commit 93dfaf5

Browse files
committed
Correct and clarify dotnet resolver logic.
1 parent 0726e24 commit 93dfaf5

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/omnisharp/OmniSharpDotnetResolver.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,16 +39,16 @@ export class OmniSharpDotnetResolver implements IHostExecutableResolver {
3939
throw new Error(`Unknown result output from 'dotnet --version'. Received ${result.stdout}`);
4040
}
4141

42-
if (this.testVersionPart(segments[0], minimumDotnetMajor, result.stdout)
43-
|| this.testVersionPart(segments[1], minimumDotnetMinor, result.stdout)) {
42+
if (this.versionPartIsGreaterThanMinimum(segments[0], minimumDotnetMajor, result.stdout)
43+
|| this.versionPartIsGreaterThanMinimum(segments[1], minimumDotnetMinor, result.stdout)) {
4444
return {
4545
version: result.stdout,
4646
path: options.dotnetPath,
4747
env
4848
};
4949
}
5050

51-
this.testVersionPart(segments[2], minimumDotnetPatch, result.stdout);
51+
this.versionPartIsGreaterThanMinimum(segments[2], minimumDotnetPatch, result.stdout);
5252

5353
return {
5454
version: result.stdout,
@@ -57,11 +57,11 @@ export class OmniSharpDotnetResolver implements IHostExecutableResolver {
5757
};
5858
}
5959

60-
private testVersionPart(actualVersion: number, minimumRequired: number, foundVersion: string): boolean {
60+
private versionPartIsGreaterThanMinimum(actualVersion: number, minimumRequired: number, foundVersion: string): boolean {
6161
if (actualVersion < minimumRequired) {
6262
throw new Error(`Found dotnet version ${foundVersion}. Minimum required version is ${minimumDotnetMajor}.${minimumDotnetMinor}.${minimumDotnetPatch}.`);
6363
}
6464

65-
return actualVersion === minimumRequired;
65+
return actualVersion > minimumRequired;
6666
}
6767
}

0 commit comments

Comments
 (0)