rework the tasks structure

Bumps [@actions/tool-cache](https://github.com/actions/toolkit/tree/HEAD/packages/tool-cache) from 1.3.0 to 1.3.1.
- [Release notes](https://github.com/actions/toolkit/releases)
- [Changelog](https://github.com/actions/toolkit/blob/master/packages/tool-cache/RELEASES.md)
- [Commits](https://github.com/actions/toolkit/commits/HEAD/packages/tool-cache)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>

.github/workflows/ci.yml

@@ -19,11 +19,11 @@ jobs:
         npm run build:azure
       name: Build code
     - name: Install GitVersion
-      uses: ./setup-gitversion
+      uses: ./gitversion/setup
       with:
         versionSpec: '5.1.2'
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
-      uses: ./execute-gitversion
+      uses: ./gitversion/execute
     - run: |
         echo "FullSemVer: ${{ steps.gitversion.outputs.fullSemVer }}"

.github/workflows/release.yml

@@ -21,12 +21,12 @@ jobs:
         npm run build:azure
       name: Build code
     - name: Install GitVersion
-      uses: ./setup-gitversion
+      uses: ./gitversion/setup
       with:
         versionSpec: '5.1.2'
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
-      uses: ./execute-gitversion
+      uses: ./gitversion/execute
     - run: |
         $date = Get-Date -format "yyMMddHHmm"
         $version = "${{steps.gitversion.outputs.majorMinorPatch}}.$date"
@@ -35,7 +35,7 @@ jobs:
 
         . .\dist\azure\update-version.ps1
         update-manifest .\dist\azure\vss-extension.json -Version $version
-        dir .\dist\azure\**\task.json | % { update-task $_ -Major $major -Minor $minor }
+        dir -r .\dist\**\task.json | % { update-task $_ -Major $major -Minor $minor }
 
         npm run publish:azure -- --token ${{ secrets.TFX_TOKEN }}
       shell: pwsh

.vscode/launch.json

@@ -9,7 +9,7 @@
             "request": "launch",
             "preLaunchTask": "Build-Mock",
             "name": "Debug Mock Setup GitVersion",
-            "program": "${workspaceFolder}/dist/mock/setup-gitversion/bundle.js",
+            "program": "${workspaceFolder}/dist/mock/gitversion/setup/bundle.js",
             "outFiles": [ "${workspaceFolder}/**/*.js" ]
         },
         {
@@ -17,7 +17,7 @@
             "request": "launch",
             "preLaunchTask": "Build-Azure",
             "name": "Debug Azure Setup GitVersion",
-            "program": "${workspaceFolder}/dist/azure/setup-gitversion/bundle.js",
+            "program": "${workspaceFolder}/dist/azure/gitversion/setup/bundle.js",
             "outFiles": [ "${workspaceFolder}/**/*.js" ]
         },
         {
@@ -25,7 +25,7 @@
             "request": "launch",
             "preLaunchTask": "Build-GitHub",
             "name": "Debug GitHub Setup GitVersion",
-            "program": "${workspaceFolder}/dist/github/setup-gitversion/bundle.js",
+            "program": "${workspaceFolder}/dist/github/gitversion/setup/bundle.js",
             "outFiles": [ "${workspaceFolder}/**/*.js" ]
         },
         {
@@ -33,7 +33,7 @@
             "request": "launch",
             "preLaunchTask": "Build-Mock",
             "name": "Debug Mock Execute GitVersion",
-            "program": "${workspaceFolder}/dist/mock/execute-gitversion/bundle.js",
+            "program": "${workspaceFolder}/dist/mock/gitversion/execute/bundle.js",
             "outFiles": [ "${workspaceFolder}/**/*.js" ]
         },
         {
@@ -41,7 +41,7 @@
             "request": "launch",
             "preLaunchTask": "Build-Azure",
             "name": "Debug Azure Execute GitVersion",
-            "program": "${workspaceFolder}/dist/azure/execute-gitversion/bundle.js",
+            "program": "${workspaceFolder}/dist/azure/gitversion/execute/bundle.js",
             "outFiles": [ "${workspaceFolder}/**/*.js" ]
         },
         {
@@ -49,7 +49,7 @@
             "request": "launch",
             "preLaunchTask": "Build-GitHub",
             "name": "Debug GitHub Execute GitVersion",
-            "program": "${workspaceFolder}/dist/github/execute-gitversion/bundle.js",
+            "program": "${workspaceFolder}/dist/github/gitversion/execute/bundle.js",
             "outFiles": [ "${workspaceFolder}/**/*.js" ]
         },
     ]

README.md

@@ -9,7 +9,7 @@ GitHub Actions that allow to install and use the GitVersion and GitReleaseManage
 
 ## Usage
 
-See [setup](setup-gitversion/action.yml) and [usage](execute-gitversion/action.yml)
+See [setup](gitversion/setup) and [usage](gitversion/execute/action.yml)
 
 ## Dependency
 
@@ -20,26 +20,24 @@ There are two step dependencies that are required in your workflow before runnin
     - name: Checkout
       uses: actions/checkout@v2
     - name: Fetch all history for all tags and branches
-      run: |
+      run: git fetch --prune --unshallow
-        git fetch --prune --unshallow
 ```
 
 Basic:
 
 ```yaml
     steps:
-    - uses: actions/checkout@v1
+    - name: Checkout
-    - name: Fetch tags and master for GitVersion
+      uses: actions/checkout@v2
-      run: |
+    - name: Fetch all history for all tags and branches
-          git fetch --tags
+      run: git fetch --prune --unshallow
-          git branch --create-reflog master origin/master
     - name: Install GitVersion
-      uses: gittools/actions/setup-gitversion@v0.3
+      uses: gittools/actions/gitversion/setup@v0.6
       with:
           versionSpec: '5.1.x'
     - name: Use GitVersion
       id: gitversion # step id used as reference for output values
-      uses: gittools/actions/execute-gitversion@v0.3
+      uses: gittools/actions/gitversion/execute@v0.6
     - run: |
         echo "Major: ${{ steps.gitversion.outputs.major }}"
         echo "Minor: ${{ steps.gitversion.outputs.minor }}"

dist/azure/gitreleasemanager/setup/task.json

@@ -1,6 +1,6 @@
 {
     "id": "e3022448-b00d-4b57-b504-606a0bcf8279",
-    "name": "gitreleasemanager-setup",
+    "name": "gitreleasemanager/setup",
     "friendlyName": "Setup GitReleaseManager Task",
     "description": "Tool for creating and exporting releases for software applications hosted on GitHub",
     "author": "GitTools Contributors",
@@ -20,7 +20,7 @@
             "workingDirectory": "."
         }
     },
-    "instanceNameFormat": "gitreleasemanager-setup",
+    "instanceNameFormat": "gitreleasemanager/setup",
     "inputs": [{
             "name": "versionSpec",
             "type": "string",

dist/azure/gitversion/execute/task.json

@@ -1,6 +1,6 @@
 {
     "id": "9013cf7f-ee8d-49f4-a39b-db244928d391",
-    "name": "gitversion-execute",
+    "name": "gitversion/execute",
     "friendlyName": "Execute GitVersion Task",
     "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
     "author": "GitTools Contributors",
@@ -20,7 +20,7 @@
             "workingDirectory": "."
         }
     },
-    "instanceNameFormat": "gitversion-execute",
+    "instanceNameFormat": "gitversion/execute",
     "groups": [{
             "name": "gitversionDetails",
             "displayName": "GitVersion details",

dist/azure/gitversion/setup/task.json

@@ -1,6 +1,6 @@
 {
     "id": "a06c02ae-7b9a-4082-90dc-fe27b500e54f",
-    "name": "gitversion-setup",
+    "name": "gitversion/setup",
     "friendlyName": "Setup GitVersion Task",
     "description": "Easy Semantic Versioning (http://semver.org) for projects using Git",
     "author": "GitTools Contributors",
@@ -20,7 +20,7 @@
             "workingDirectory": "."
         }
     },
-    "instanceNameFormat": "gitversion-setup",
+    "instanceNameFormat": "gitversion/setup",
     "inputs": [{
             "name": "versionSpec",
             "type": "string",

dist/azure/vss-extension.json

@@ -11,9 +11,9 @@
         "id": "Microsoft.VisualStudio.Services"
     }],
     "files": [
-        { "path": "setup-gitversion" },
+        { "path": "gitversion/setup" },
-        { "path": "execute-gitversion" },
+        { "path": "gitversion/execute" },
-        { "path": "setup-gitreleasemanager" }
+        { "path": "gitreleasemanager/setup" }
     ],
     "categories": [
         "Azure Pipelines"
@@ -67,7 +67,7 @@
             "ms.vss-distributed-task.tasks"
         ],
         "properties": {
-            "name": "setup-gitversion"
+            "name": "gitversion/setup"
         }
     }, {
         "id": "execute-gitversion-task",
@@ -76,7 +76,7 @@
             "ms.vss-distributed-task.tasks"
         ],
         "properties": {
-            "name": "execute-gitversion"
+            "name": "gitversion/execute"
         }
     }, {
         "id": "setup-gitreleasemanager-task",
@@ -85,7 +85,7 @@
             "ms.vss-distributed-task.tasks"
         ],
         "properties": {
-            "name": "setup-gitreleasemanager"
+            "name": "gitreleasemanager/setup"
         }
     }]
 }

gitreleasemanager/setup/action.yml

@@ -6,7 +6,7 @@ branding:
   icon: git-pull-request
 runs:
   using: node12
-  main: ../dist/github/setup-gitreleasemanager/bundle.js
+  main: ../../dist/github/gitreleasemanager/setup/bundle.js
 inputs:
   versionSpec:
     description: Required version in the form of 0.10.x or exact version like 0.10.2

gitversion/execute/action.yml

@@ -6,7 +6,7 @@ branding:
   icon: git-pull-request
 runs:
   using: node12
-  main: ../dist/github/execute-gitversion/bundle.js
+  main: ../../dist/github/gitversion/execute/bundle.js
 inputs:
   targetPath:
     description: Optionally supply the path to the working directory

gitversion/setup/action.yml

@@ -6,7 +6,7 @@ branding:
   icon: git-pull-request
 runs:
   using: node12
-  main: ../dist/github/setup-gitversion/bundle.js
+  main: ../../dist/github/gitversion/setup/bundle.js
 inputs:
   versionSpec:
     description: Required version in the form of 5.x or exact version like 5.0.0

package-lock.json

@@ -5,9 +5,9 @@
     "requires": true,
     "dependencies": {
         "@actions/core": {
-            "version": "1.2.1",
+            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.1.tgz",
+            "resolved": "https://registry.npmjs.org/@actions/core/-/core-1.2.2.tgz",
-            "integrity": "sha512-xD+CQd9p4lU7ZfRqmUcbJpqR+Ss51rJRVeXMyOLrZQImN9/8Sy/BEUBnHO/UKD3z03R686PVTLfEPmkropGuLw=="
+            "integrity": "sha512-IbCx7oefq+Gi6FWbSs2Fnw8VkEI6Y4gvjrYprY3RV//ksq/KPMlClOerJ4jRosyal6zkUIc8R9fS/cpRMlGClg=="
         },
         "@actions/exec": {
             "version": "1.0.3",
@@ -18,9 +18,19 @@
             }
         },
         "@actions/http-client": {
-            "version": "1.0.1",
+            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/@actions/http-client/-/http-client-1.0.3.tgz",
-            "integrity": "sha512-vy5DhqTJ1gtEkpRrD/6BHhUlkeyccrOX0BT9KmtO5TWxe5KSSwVHFE+J15Z0dG+tJwZJ/nHC4slUIyqpkahoMg=="
+            "integrity": "sha512-wFwh1U4adB/Zsk4cc9kVqaBOHoknhp/pJQk+aWTocbAZWpIl4Zx/At83WFRLXvxB+5HVTWOACM6qjULMZfQSfw==",
+            "requires": {
+                "tunnel": "0.0.6"
+            },
+            "dependencies": {
+                "tunnel": {
+                    "version": "0.0.6",
+                    "resolved": "https://registry.npmjs.org/tunnel/-/tunnel-0.0.6.tgz",
+                    "integrity": "sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg=="
+                }
+            }
         },
         "@actions/io": {
             "version": "1.0.2",
@@ -28,13 +38,13 @@
             "integrity": "sha512-J8KuFqVPr3p6U8W93DOXlXW6zFvrQAJANdS+vw0YhusLIq+bszW8zmK2Fh1C2kDPX8FMvwIl1OUcFgvJoXLbAg=="
         },
         "@actions/tool-cache": {
-            "version": "1.3.0",
+            "version": "1.3.1",
-            "resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.3.0.tgz",
+            "resolved": "https://registry.npmjs.org/@actions/tool-cache/-/tool-cache-1.3.1.tgz",
-            "integrity": "sha512-pbv32I89niDShw1YTDo0OFQmWPkZPElE7e3So1jfEzjIyzGRfYIzshwOVhemJZLcDtzo3kxO3GFDAmuVvub/6w==",
+            "integrity": "sha512-sKoEJv0/c7WzjPEq2PO12Sc8QdEp58XIBHMm3c4lUn/iZWgLz9HBeCuFGpLQjDvXJNfLZ4g+WD+rMjgOmpH4Ag==",
             "requires": {
                 "@actions/core": "^1.2.0",
                 "@actions/exec": "^1.0.0",
-                "@actions/http-client": "^1.0.1",
+                "@actions/http-client": "^1.0.3",
                 "@actions/io": "^1.0.1",
                 "semver": "^6.1.0",
                 "uuid": "^3.3.2"
@@ -48,18 +58,18 @@
             }
         },
         "@babel/code-frame": {
-            "version": "7.5.5",
+            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.5.5.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-            "integrity": "sha512-27d4lZoomVyo51VegxI20xZPuSHusqbQag/ztrBC7wegWoQ1nLREPVSKSW8byhTlzTKyNE4ifaTA6lCp7JjpFw==",
+            "integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
             "dev": true,
             "requires": {
-                "@babel/highlight": "^7.0.0"
+                "@babel/highlight": "^7.8.3"
             }
         },
         "@babel/highlight": {
-            "version": "7.5.0",
+            "version": "7.8.3",
-            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.5.0.tgz",
+            "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-            "integrity": "sha512-7dV4eu9gBxoM0dAnj/BCFDW9LFU0zvTrkq0ugM7pnHEgguOEeOz1so2ZghEdzviYzQEED0r4EAgpsBChKy1TRQ==",
+            "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
             "dev": true,
             "requires": {
                 "chalk": "^2.0.0",
@@ -68,9 +78,9 @@
             }
         },
         "@types/node": {
-            "version": "13.1.8",
+            "version": "13.5.0",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.1.8.tgz",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.5.0.tgz",
-            "integrity": "sha512-6XzyyNM9EKQW4HKuzbo/CkOIjn/evtCmsU+MUM1xDfJ+3/rNjBttM1NgN7AOQvN6tP1Sl1D1PIKMreTArnxM9A==",
+            "integrity": "sha512-Onhn+z72D2O2Pb2ql2xukJ55rglumsVo1H6Fmyi8mlU9SvKdBk/pUSUAiBY/d9bAOF7VVWajX3sths/+g6ZiAQ==",
             "dev": true
         },
         "@types/q": {
@@ -1562,9 +1572,9 @@
             "dev": true
         },
         "diff": {
-            "version": "4.0.1",
+            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.1.tgz",
+            "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
-            "integrity": "sha512-s2+XdvhPCOF01LRQBC8hf4vhbVmI2CGS5aZnxLJlT5FtdhPCDFq80q++zK2KlrVorVDdL5BOGZ/VfLrVtYNF+Q==",
+            "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
             "dev": true
         },
         "diffie-hellman": {
@@ -5455,9 +5465,9 @@
             "dev": true
         },
         "tslint": {
-            "version": "5.20.1",
+            "version": "6.0.0",
-            "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.20.1.tgz",
+            "resolved": "https://registry.npmjs.org/tslint/-/tslint-6.0.0.tgz",
-            "integrity": "sha512-EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg==",
+            "integrity": "sha512-9nLya8GBtlFmmFMW7oXXwoXS1NkrccqTqAtwXzdPV9e2mqSEvCki6iHL/Fbzi5oqbugshzgGPk7KBb2qNP1DSA==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.0.0",
@@ -5471,7 +5481,7 @@
                 "mkdirp": "^0.5.1",
                 "resolve": "^1.3.2",
                 "semver": "^5.3.0",
-                "tslib": "^1.8.0",
+                "tslib": "^1.10.0",
                 "tsutils": "^2.29.0"
             }
         },

package.json

@@ -24,10 +24,10 @@
     ],
     "license": "MIT",
     "dependencies": {
-        "@actions/core": "^1.2.1",
+        "@actions/core": "^1.2.2",
         "@actions/exec": "^1.0.3",
         "@actions/io": "^1.0.2",
-        "@actions/tool-cache": "^1.3.0",
+        "@actions/tool-cache": "^1.3.1",
         "azure-pipelines-task-lib": "^2.9.3",
         "azure-pipelines-tool-lib": "^0.12.0",
         "inversify": "^5.0.1",
@@ -35,7 +35,7 @@
         "uuid": "^3.4.0"
     },
     "devDependencies": {
-        "@types/node": "^13.1.8",
+        "@types/node": "^13.5.0",
         "@types/q": "^1.5.2",
         "@types/semver-compare": "^1.0.1",
         "@types/uuid": "^3.4.6",
@@ -44,7 +44,7 @@
         "replace-in-file-webpack-plugin": "^1.0.6",
         "tfx-cli": "^0.7.11",
         "ts-loader": "^6.2.1",
-        "tslint": "^5.20.1",
+        "tslint": "^6.0.0",
         "typescript": "^3.7.5",
         "webpack": "^4.41.5",
         "webpack-cli": "^3.3.10"

src/execute-gitversion.ts

@@ -1,4 +0,0 @@
-import "reflect-metadata";
-import { run } from "./core/gitversion";
-
-run();

src/setup-gitreleasemanager.ts

@@ -1,4 +0,0 @@
-import "reflect-metadata";
-import { setup } from "./core/gitreleasemanager";
-
-setup();

src/setup-gitversion.ts

@@ -1,4 +0,0 @@
-import "reflect-metadata";
-import { setup } from "./core/gitversion";
-
-setup();

src/tasks/gitreleasemanager/setup.ts

@@ -0,0 +1,4 @@
+import "reflect-metadata";
+import { setup } from "../../core/gitreleasemanager";
+
+setup();

src/tasks/gitversion/execute.ts

@@ -0,0 +1,4 @@
+import "reflect-metadata";
+import { run } from "../../core/gitversion";
+
+run();

src/tasks/gitversion/setup.ts

@@ -0,0 +1,4 @@
+import "reflect-metadata";
+import { setup } from "../../core/gitversion";
+
+setup();

webpack.config.js

@@ -8,9 +8,9 @@ module.exports = (env) => {
 
     return {
         entry: {
-            'setup-gitversion': path.resolve(__dirname, 'src/setup-gitversion.ts'),
+            'gitversion/setup': path.resolve(__dirname, 'src/tasks/gitversion/setup.ts'),
-            'setup-gitreleasemanager': path.resolve(__dirname, 'src/setup-gitreleasemanager.ts'),
+            'gitversion/execute': path.resolve(__dirname, 'src/tasks/gitversion/execute.ts'),
-            'execute-gitversion': path.resolve(__dirname, 'src/execute-gitversion.ts'),
+            'gitreleasemanager/setup': path.resolve(__dirname, 'src/tasks/gitreleasemanager/setup.ts'),
         },
         target: 'node',
         mode: mode,