Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions dist/tools/libs/gitversion.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ class GitVersionSettingsProvider extends SettingsProvider {
const disableCache = this.buildAgent.getBooleanInput("disableCache");
const disableNormalization = this.buildAgent.getBooleanInput("disableNormalization");
const disableShallowCloneCheck = this.buildAgent.getBooleanInput("disableShallowCloneCheck");
const configFilePath = this.buildAgent.getInput("configFilePath");
const overrideConfig = this.buildAgent.getListInput("overrideConfig");
const configFilePath = this.buildAgent.getInput("configFilePath", false);
const overrideConfig = this.buildAgent.getListInput("overrideConfig", false);
const updateAssemblyInfo = this.buildAgent.getBooleanInput("updateAssemblyInfo");
const updateAssemblyInfoFilename = this.buildAgent.getInput("updateAssemblyInfoFilename");
const updateProjectFiles = this.buildAgent.getBooleanInput("updateProjectFiles");
Expand Down Expand Up @@ -138,7 +138,7 @@ class GitVersionTool extends DotnetTool {
}
if (updateAssemblyInfo) {
builder.addArgument("/updateassemblyinfo");
if (updateAssemblyInfoFilename?.length > 0) {
if (updateAssemblyInfoFilename) {
if (await this.isValidInputFile("updateAssemblyInfoFilename", updateAssemblyInfoFilename)) {
builder.addArgument(updateAssemblyInfoFilename);
} else {
Expand Down
2 changes: 1 addition & 1 deletion dist/tools/libs/gitversion.mjs.map

Large diffs are not rendered by default.

9 changes: 9 additions & 0 deletions src/__tests__/tools/gitversion/tool.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,15 @@ describe('GitVersionTool', () => {
).rejects.toThrowError(`GitVersion configuration file not found at ${configFile}`)
})

it('should return correct arguments for settings with no config file', async () => {
tool.init(false)
await expect(
tool.getExecuteArguments('workdir', {
configFilePath: undefined
} as ExecuteSettings)
).resolves.toEqual(['workdir', '/output', 'json', '/l', 'console'])
})

it('should return correct arguments for settings with override config', async () => {
const args = await tool.getExecuteArguments('workdir', {
overrideConfig: ['tag-prefix=release-', 'next-version=1.0.0']
Expand Down
6 changes: 3 additions & 3 deletions src/tools/gitversion/models.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@ export type ExecuteSettings = {
disableCache: boolean
disableNormalization: boolean
disableShallowCloneCheck: boolean
configFilePath: string
overrideConfig: string[]
configFilePath?: string
overrideConfig?: string[]
updateAssemblyInfo: boolean
updateAssemblyInfoFilename: string
updateAssemblyInfoFilename?: string
updateProjectFiles: boolean
buildNumberFormat?: string
}
Expand Down
4 changes: 2 additions & 2 deletions src/tools/gitversion/settings.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ export class GitVersionSettingsProvider extends SettingsProvider implements IGit
const disableNormalization = this.buildAgent.getBooleanInput<ExecuteSettings>('disableNormalization')
const disableShallowCloneCheck = this.buildAgent.getBooleanInput<ExecuteSettings>('disableShallowCloneCheck')

const configFilePath = this.buildAgent.getInput<ExecuteSettings>('configFilePath')
const overrideConfig = this.buildAgent.getListInput<ExecuteSettings>('overrideConfig')
const configFilePath = this.buildAgent.getInput<ExecuteSettings>('configFilePath', false)
const overrideConfig = this.buildAgent.getListInput<ExecuteSettings>('overrideConfig', false)

const updateAssemblyInfo = this.buildAgent.getBooleanInput<ExecuteSettings>('updateAssemblyInfo')
const updateAssemblyInfoFilename = this.buildAgent.getInput<ExecuteSettings>('updateAssemblyInfoFilename')
Expand Down
2 changes: 1 addition & 1 deletion src/tools/gitversion/tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export class GitVersionTool extends DotnetTool {
builder.addArgument('/updateassemblyinfo')

// You can specify 'updateAssemblyInfo' without 'updateAssemblyInfoFilename'.
if (updateAssemblyInfoFilename?.length > 0) {
if (updateAssemblyInfoFilename) {
if (await this.isValidInputFile('updateAssemblyInfoFilename', updateAssemblyInfoFilename)) {
builder.addArgument(updateAssemblyInfoFilename)
} else {
Expand Down