Merge pull request #776 from pascalberger/ExtensionImprov

Fix build & improve VSTS extension

Author: JakeGinnivan

appveyor.yml

@@ -27,7 +27,7 @@ build_script:
 
   - cmd: 7z a "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip" -r .\build\GitVersionTfsTaskBuild\GitVersionTask\*.*
   - cmd: appveyor PushArtifact "GitVersionTfsBuildTask_%GitVersion_NuGetVersion%.zip"
-  - cmd: appveyor PushArtifact "jakeginnivan.gitversion-%GitVersion_MajorMinorPatch%.vsix"
+  - cmd: appveyor PushArtifact "build\GitVersionTfsTaskBuild\jakeginnivan.gitversion-%GitVersion_SemVer%.vsix"
 
 test_script:
   - nunit-console "src\GitVersionTask.Tests\bin\%CONFIGURATION%\GitVersionTask.Tests.dll" "src\GitVersionExe.Tests\bin\%CONFIGURATION%\GitVersionExe.Tests.dll" "src\GitVersionCore.Tests\bin\%CONFIGURATION%\GitVersionCore.Tests.dll" /noshadow

src/GitVersion.sln

@@ -32,6 +32,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TfsTask", "TfsTask", "{A0ED
 		GitVersionTfsTask\Create-Vsix.ps1 = GitVersionTfsTask\Create-Vsix.ps1
 		GitVersionTfsTask\GitVersion.ps1 = GitVersionTfsTask\GitVersion.ps1
 		GitVersionTfsTask\icon.png = GitVersionTfsTask\icon.png
+		GitVersionTfsTask\extension-icon.png = GitVersionTfsTask\extension-icon.png
 		GitVersionTfsTask\manifest.json = GitVersionTfsTask\manifest.json
 		GitVersionTfsTask\overview.md = GitVersionTfsTask\overview.md
 		GitVersionTfsTask\task.json = GitVersionTfsTask\task.json

src/GitVersionExe/GitVersionExe.csproj

@@ -161,7 +161,7 @@
     <!-- TfsBuildTask -->
     <Copy SourceFiles="@(amd64)" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\NativeBinaries\amd64" />
     <Copy SourceFiles="@(x86)" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\NativeBinaries\x86" />
-    <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
+    <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\extension-icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\manifest.json" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\overview.md" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
     <Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\builds.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild\img" />

src/GitVersionTfsTask/extension-icon.png

@@ -1,10 +1,11 @@
 {
+    "manifestVersion": 1,
     "id": "gitversion",
     "name": "GitVersion",
     "publisher": "jakeginnivan",
     "author": "GitVersion Contributors",
     "version": "$version$",
-    "description": "Easy Semantic Versioning (http://semver.org) for projects using Git, includes GitVersion Build Task",
+    "description": "Build task for easy semantic versioning for projects using Git.",
     "targets": [
         {
             "id": "Microsoft.VisualStudio.Services"
@@ -19,24 +20,28 @@
         "Build and release"
     ],
     "icons": {
-        "default": "icon.png"
+        "default": "extension-icon.png"
     },
     "tags": [
         "semver",
+        "git",
         "versioning",
         "gitflow",
         "githubflow"
     ],
     "links": {
-        "documentation": {
-            "uri": "http://gitversion.readthedocs.org/en/latest"
+        "learn": {
+            "uri": "http://gitversion.readthedocs.org/en/stable"
         },
         "getstarted": {
-            "uri": "http://gitversion.readthedocs.org/en/latest/build-server-support/build-server/tfs-build-vnext/#running-inside-tfs"
+            "uri": "http://gitversion.readthedocs.org/en/stable/build-server-support/build-server/tfs-build-vnext/#running-inside-tfs"
         },
-        "repository": {
-            "uri": "https://github.com/GitTools/GitVersion"
-        }
+        "license": {
+            "uri": "https://github.com/GitTools/GitVersion/blob/master/LICENSE"
+        },
+        "support": {
+            "uri": "https://github.com/GitTools/GitVersion/issues"
+        }        
     },
     "screenshots": [
         {
@@ -51,10 +56,6 @@
             "path": "overview.md"
         }
     },
-    "scopes": [
-        "vso.build",
-        "vso.build_execute"
-    ],
     "contributions": [
         {
             "id": "gitversion-task",

src/GitVersionTfsTask/manifest.json

@@ -1,4 +1,4 @@
-Versioning when using git, solved. GitVersion looks at your git history and works out the semantic version (semver.org) of the commit being built.
+Versioning when using Git, solved. GitVersion looks at your Git history and works out the [semantic version](http://semver.org) of the commit being built.
 
 It works with most branching strategies but has been designed mainly around GitFlow and GitHubFlow (pull request workflow). The calculated version numbers can then be accessed through variables such as `$(GitVersion_NuGetVersion)` and `$(GitVersion_SemVer)`. It is also very configurable to allow it to work with most release workflows!