Revert "Merge pull request #812 from GitTools/bug/prerelease"
This reverts commit a6b18fd71f.
This commit is contained in:
@@ -1,3 +1,4 @@
|
||||
import cmp from 'semver-compare'
|
||||
import * as semver from 'semver'
|
||||
import { injectable, inject } from 'inversify'
|
||||
|
||||
@@ -5,7 +6,7 @@ import { IBuildAgent, TYPES } from './models'
|
||||
|
||||
export interface IVersionManager {
|
||||
isExplicitVersion(versionSpec: string): boolean
|
||||
evaluateVersions(versions: string[], versionSpec: string, optionsOrLoose?: boolean | semver.RangeOptions): string
|
||||
evaluateVersions(versions: string[], versionSpec: string): string
|
||||
cleanVersion(version: string): string
|
||||
}
|
||||
|
||||
@@ -26,13 +27,13 @@ export class VersionManager implements IVersionManager {
|
||||
return valid
|
||||
}
|
||||
|
||||
public evaluateVersions(versions: string[], versionSpec: string, optionsOrLoose?: boolean | semver.RangeOptions): string {
|
||||
public evaluateVersions(versions: string[], versionSpec: string): string {
|
||||
let version: string
|
||||
this.buildAgent.debug('evaluating ' + versions.length + ' versions')
|
||||
versions = semver.sort(versions)
|
||||
versions = versions.sort(cmp)
|
||||
for (let i = versions.length - 1; i >= 0; i--) {
|
||||
const potential: string = versions[i]
|
||||
const satisfied: boolean = semver.satisfies(potential, versionSpec, optionsOrLoose)
|
||||
const satisfied: boolean = semver.satisfies(potential, versionSpec)
|
||||
if (satisfied) {
|
||||
version = potential
|
||||
break
|
||||
|
||||
Reference in New Issue
Block a user