GH 1782 - fix vsix config file

Author: arturcic

src/GitVersionTfsTask/GitVersion.ts

@@ -7,7 +7,7 @@ export class GitVersionTask {
     execOptions: tr.IExecOptions;
 
     preferBundledVersion: boolean;
-    configFilePathSupplied: boolean;
+    useConfigFile: boolean;
     configFilePath: string;
     updateAssemblyInfo: boolean;
 
@@ -22,11 +22,13 @@ export class GitVersionTask {
 
     constructor() {
         this.preferBundledVersion       = tl.getBoolInput('preferBundledVersion') || true;
-        this.configFilePathSupplied     = tl.filePathSupplied('configFilePath');
-        this.configFilePath             = tl.getPathInput('configFilePath', false, true);
-        this.updateAssemblyInfo         = tl.getBoolInput('updateAssemblyInfo');
 
+        this.useConfigFile              = tl.getBoolInput('useConfigFile');
+        this.configFilePath             = tl.getInput('configFilePath');
+
+        this.updateAssemblyInfo         = tl.getBoolInput('updateAssemblyInfo');
         this.updateAssemblyInfoFilename = tl.getInput('updateAssemblyInfoFilename');
+
         this.additionalArguments        = tl.getInput('additionalArguments');
         this.targetPath                 = tl.getInput('targetPath');
         this.runtime                    = tl.getInput('runtime') || "core";
@@ -60,16 +62,22 @@ export class GitVersionTask {
                 "buildserver",
                 "/nofetch"]);
 
-            if (this.configFilePathSupplied && this.configFilePath) {
-                exe.arg(["/config", this.configFilePath]);
+            if (this.useConfigFile) {
+                if (tl.filePathSupplied('configFilePath') && tl.exist(this.configFilePath) && tl.stats(this.configFilePath).isFile()) {
+                    exe.arg(["/config", this.configFilePath]);
+                }
+                else {
+                    throw 'GitVersion configuration file not found at ' + this.configFilePath;
+                }
             }
 
             if (this.updateAssemblyInfo) {
                 exe.arg("/updateassemblyinfo");
-                if (this.updateAssemblyInfoFilename) {
+                if (tl.filePathSupplied('updateAssemblyInfoFilename') && tl.exist(this.updateAssemblyInfoFilename) && tl.stats(this.updateAssemblyInfoFilename).isFile()) {
                     exe.arg(this.updateAssemblyInfoFilename);
-                } else {
-                    exe.arg("true");
+                }
+                else {
+                    throw 'AssemblyInfoFilename file not found at ' + this.updateAssemblyInfoFilename;
                 }
             }
 

src/GitVersionTfsTask/GitVersionTask/task.json

@@ -42,13 +42,21 @@
         "defaultValue": "true",
         "required": false,
         "helpMarkDown": "If checked it will prefer the bundled version over a version found in path"
+    }, {
+        "name": "useConfigFile",
+        "type": "boolean",
+        "label": "Specify Configuration file",
+        "defaultValue": "false",
+        "required": false,
+        "helpMarkDown": "Whether to use a custom configuration file"
     }, {
         "name": "configFilePath",
         "type": "filePath",
-        "label": "Config file",
+        "label": "Configuration file",
         "defaultValue": "",
         "required": false,
-        "helpMarkDown": "Optional path to config file (defaults to GitVersion.yml)"
+        "helpMarkDown": "Optional path to config file (defaults to GitVersion.yml)",
+        "visibleRule": "useConfigFile = true"
     }, {
         "name": "updateAssemblyInfo",
         "type": "boolean",
@@ -83,10 +91,10 @@
     }, {
         "name": "additionalArguments",
         "type": "string",
-        "label": "Additional GitVersion.exe arguments",
+        "label": "Additional GitVersion arguments",
         "defaultValue": "",
         "required": false,
-        "helpMarkDown": "Additional arguments to send to GitVersion.exe",
+        "helpMarkDown": "Additional arguments to send to GitVersion",
         "groupName": "additional"
     }],
     "execution": {
@@ -96,4 +104,4 @@
             "workingDirectory": "."
         }
     }
-}
+}