Skip to content

Only append /config if the user specified a configFilePath #1777

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
arturcic merged 3 commits into from
Aug 15, 2019
Merged

Only append /config if the user specified a configFilePath #1777

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
158a9ad
Make sure configFilePath as supplied by the user
chuseman Aug 13, 2019
4df542a
Check that configFilePath exists (if specified)
chuseman Aug 13, 2019
222fef9
Merge branch 'master' into fix-optional-file-path
arturcic Aug 15, 2019
File filter

Filter by extension

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: 4 additions & 2 deletions src/GitVersionTfsTask/GitVersion.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ export class GitVersionTask {
execOptions: tr.IExecOptions;

preferBundledVersion: boolean;
configFilePathSupplied: boolean;
configFilePath: string;
updateAssemblyInfo: boolean;

Expand All @@ -21,7 +22,8 @@ export class GitVersionTask {

constructor() {
this.preferBundledVersion = tl.getBoolInput('preferBundledVersion') || true;
this.configFilePath = tl.getPathInput('configFilePath');
this.configFilePathSupplied = tl.filePathSupplied('configFilePath');
this.configFilePath = tl.getPathInput('configFilePath', false, true);
this.updateAssemblyInfo = tl.getBoolInput('updateAssemblyInfo');

this.updateAssemblyInfoFilename = tl.getInput('updateAssemblyInfoFilename');
Expand Down Expand Up @@ -58,7 +60,7 @@ export class GitVersionTask {
"buildserver",
"/nofetch"]);

if (this.configFilePath) {
if (this.configFilePathSupplied && this.configFilePath) {
exe.arg(["/config", this.configFilePath]);
}

Expand Down