diff --git a/.gitignore b/.gitignore
index 385c896..6e451a4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,5 @@ node_modules/
 
 .taskkey
 *.js
-!dist/**/*.js
\ No newline at end of file
+!dist/**/*.js
+*.vsix
diff --git a/dist/azure/execute/task.json b/dist/azure/execute/task.json
index 239a0a2..54337e2 100644
--- a/dist/azure/execute/task.json
+++ b/dist/azure/execute/task.json
@@ -1,7 +1,7 @@
 {
-    "id": "dd065e3b-6aef-46af-845c-520195836b35",
-    "name": "UseGitVersion",
-    "friendlyName": "GitVersion Task$titleSuffix$",
+    "id": "1fd80e12-d27d-49d5-a887-be96689d3b57",
+    "name": "ExecuteGitVersion",
+    "friendlyName": "Excute GitVersion Task",
     "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
     "author": "GitVersion Contributors",
     "helpMarkDown": "See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help",
@@ -13,8 +13,8 @@
         "Patch": "2"
     },
     "minimumAgentVersion": "2.115.0",
-    "groups": [
-        {
+    "instanceNameFormat": "ExecuteGitVersion",
+    "groups": [{
             "name": "gitversionDetails",
             "displayName": "GitVersion details",
             "isExpanded": true
@@ -25,25 +25,7 @@
             "isExpanded": false
         }
     ],
-    "instanceNameFormat": "GitVersion",
-    "inputs": [
-        {
-            "name": "versionSpec",
-            "type": "string",
-            "label": "The version spec",
-            "defaultValue": "",
-            "required": true,
-            "helpMarkDown": "Required version in the form of 5.x or exact version like 5.0.0"
-        },
-        {
-            "name": "includePrerelease",
-            "type": "boolean",
-            "label": "Include pre-release versions",
-            "defaultValue": "false",
-            "required": false,
-            "helpMarkDown": "Include pre-release versions when matching a version"
-        },
-        {
+    "inputs": [{
             "name": "targetPath",
             "type": "string",
             "label": "Working directory path",
@@ -96,11 +78,12 @@
             "groupName": "additional"
         }
     ],
+
     "execution": {
         "Node": {
-            "target": "GitVersion.js",
+            "target": "index.js",
             "argumentFormat": "",
             "workingDirectory": "."
         }
     }
-}
+}
\ No newline at end of file
diff --git a/dist/azure/setup/task.json b/dist/azure/setup/task.json
index 239a0a2..5b457ec 100644
--- a/dist/azure/setup/task.json
+++ b/dist/azure/setup/task.json
@@ -1,7 +1,7 @@
 {
-    "id": "dd065e3b-6aef-46af-845c-520195836b35",
-    "name": "UseGitVersion",
-    "friendlyName": "GitVersion Task$titleSuffix$",
+    "id": "cf6686dd-1807-4367-af65-669346359afd",
+    "name": "SetupGitVersion",
+    "friendlyName": "Setup GitVersion Task",
     "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
     "author": "GitVersion Contributors",
     "helpMarkDown": "See the [documentation](http://gitversion.readthedocs.org/en/latest/) for help",
@@ -13,21 +13,7 @@
         "Patch": "2"
     },
     "minimumAgentVersion": "2.115.0",
-    "groups": [
-        {
-            "name": "gitversionDetails",
-            "displayName": "GitVersion details",
-            "isExpanded": true
-        },
-        {
-            "name": "additional",
-            "displayName": "Additional Options",
-            "isExpanded": false
-        }
-    ],
-    "instanceNameFormat": "GitVersion",
-    "inputs": [
-        {
+    "inputs": [{
             "name": "versionSpec",
             "type": "string",
             "label": "The version spec",
@@ -42,65 +28,15 @@
             "defaultValue": "false",
             "required": false,
             "helpMarkDown": "Include pre-release versions when matching a version"
-        },
-        {
-            "name": "targetPath",
-            "type": "string",
-            "label": "Working directory path",
-            "defaultValue": "",
-            "required": false,
-            "helpMarkDown": "Optionally supply the path to the working directory",
-            "groupName": "gitversionDetails"
-        },
-        {
-            "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": "Configuration file",
-            "defaultValue": "",
-            "required": false,
-            "helpMarkDown": "Optional path to config file (defaults to GitVersion.yml)",
-            "visibleRule": "useConfigFile = true"
-        },
-        {
-            "name": "updateAssemblyInfo",
-            "type": "boolean",
-            "label": "Update AssemblyInfo files",
-            "defaultValue": "false",
-            "required": false,
-            "helpMarkDown": "Whether to update versions in the AssemblyInfo files"
-        },
-        {
-            "name": "updateAssemblyInfoFilename",
-            "type": "string",
-            "label": "Update Assembly File",
-            "defaultValue": "",
-            "required": false,
-            "helpMarkDown": "Update versions in specified file",
-            "visibleRule": "updateAssemblyInfo = true"
-        },
-        {
-            "name": "additionalArguments",
-            "type": "string",
-            "label": "Additional GitVersion arguments",
-            "defaultValue": "",
-            "required": false,
-            "helpMarkDown": "Additional arguments to send to GitVersion",
-            "groupName": "additional"
         }
     ],
+    "instanceNameFormat": "SetupGitVersion",
+
     "execution": {
         "Node": {
-            "target": "GitVersion.js",
+            "target": "index.js",
             "argumentFormat": "",
             "workingDirectory": "."
         }
     }
-}
+}
\ No newline at end of file
diff --git a/dist/azure/vss-extension.json b/dist/azure/vss-extension.json
index 894f155..b1a5430 100644
--- a/dist/azure/vss-extension.json
+++ b/dist/azure/vss-extension.json
@@ -1,23 +1,23 @@
 {
     "manifestVersion": 1,
-    "id": "usegitversion$idSuffix$",
-    "name": "UseGitVersion$titleSuffix$",
+    "id": "usegitversion-test",
+    "name": "UseGitVersion",
     "publisher": "gittools",
     "public": true,
     "author": "GitVersion Contributors",
-    "version": "$version$",
     "description": "Build task for easy semantic versioning for projects using Git.",
     "targets": [{
         "id": "Microsoft.VisualStudio.Services"
     }],
     "files": [
-        { "path": "GitVersionTask" }
+        { "path": "execute" },
+        { "path": "setup" }
     ],
     "categories": [
         "Azure Pipelines"
     ],
     "galleryFlags": [
-        "$visibility$"
+        "Public"
     ],
     "icons": {
         "default": "images/extension-icon.png"
@@ -59,13 +59,22 @@
         }
     },
     "contributions": [{
-        "id": "gitversion-task",
+        "id": "setup-gitversion-task",
         "type": "ms.vss-distributed-task.task",
         "targets": [
             "ms.vss-distributed-task.tasks"
         ],
         "properties": {
-            "name": "GitVersionTask"
+            "name": "setup"
+        }
+    }, {
+        "id": "execute-gitversion-task",
+        "type": "ms.vss-distributed-task.task",
+        "targets": [
+            "ms.vss-distributed-task.tasks"
+        ],
+        "properties": {
+            "name": "execute"
         }
     }]
 }
\ No newline at end of file
diff --git a/package.json b/package.json
index 19dedac..fb399f9 100644
--- a/package.json
+++ b/package.json
@@ -36,6 +36,7 @@
         "@types/node": "12.12.11",
         "@types/q": "1.5.2",
         "reflect-metadata": "^0.1.13",
+        "tfx-cli": "0.6.3",
         "tslint": "^5.20.1",
         "typescript": "^3.7.2",
         "@zeit/ncc": "^0.20.5"