GitTools/actions
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix parameters parsing, format

Browse Source
This commit is contained in:
Artur Stolear
2020-03-13 14:53:35 +02:00
parent e80e47e735
commit 7f9dcba752
44 changed files with 135 additions and 133 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/tools/gitversion/settings.ts
View File

@@ -1,6 +1,6 @@
import {IBuildAgent} from '../../core/models'
import { IBuildAgent } from '../../core/models'
import {GitVersionSettings, ExecuteFields} from './models'
import { GitVersionSettings, ExecuteFields } from './models'
export class Settings {
public static getGitVersionSettings(
@@ -24,7 +24,7 @@ export class Settings {
ExecuteFields.additionalArguments
)
const srcDir = buildAgent.getSourceDir().replace(/\\/g, '/')
const srcDir = buildAgent.getSourceDir()?.replace(/\\/g, '/')
return {
targetPath,

18
src/tools/gitversion/tool.ts
View File

@@ -1,10 +1,10 @@
import path = require('path')
import {injectable, inject} from 'inversify'
import {IExecResult, IBuildAgent, TYPES} from '../../core/models'
import {DotnetTool, IDotnetTool} from '../../core/dotnet-tool'
import {GitVersionSettings, GitVersionOutput, ExecuteFields} from './models'
import {IVersionManager} from '../../core/versionManager'
import { injectable, inject } from 'inversify'
import { IExecResult, IBuildAgent, TYPES } from '../../core/models'
import { DotnetTool, IDotnetTool } from '../../core/dotnet-tool'
import { GitVersionSettings, GitVersionOutput } from './models'
import { IVersionManager } from '../../core/versionManager'
export interface IGitVersionTool extends IDotnetTool {
install(versionSpec: string, includePrerelease: boolean): Promise<void>
@@ -43,7 +43,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
private getRepoDir(targetPath: string): string {
let workDir: string
const srcDir = this.buildAgent.getSourceDir()
const srcDir = this.buildAgent.getSourceDir() || '.'
if (!targetPath) {
workDir = srcDir
} else {
@@ -60,7 +60,7 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
workDir: string,
options: GitVersionSettings
): string[] {
const args = [workDir, '/output', 'json', '/output', 'buildserver']
const args = [workDir, '/output', 'json']
const {
useConfigFile,
@@ -102,7 +102,9 @@ export class GitVersionTool extends DotnetTool implements IGitVersionTool {
}
}
args.push(additionalArguments)
if (additionalArguments) {
args.push(additionalArguments)
}
return args
}