Merge pull request #6 from jgarverick/develop

Updating manifest for build extension to highlight specifics on task …

VSTSBuildTask/ProjectTemplate.csproj

@@ -38,6 +38,7 @@
 		<None Include="gruntfile.js" />
     <None Include="package.json" />
     <None Include="vss-extension.json"/>
+    <None Include="img\logo.png"/>
 		<Compile Include="Properties\AssemblyInfo.cs" />
 	</ItemGroup>
   <ItemGroup>

VSTSBuildTask/VSOBuildTask.vstemplate

@@ -22,6 +22,9 @@
       <Folder Name=".vscode">
         <ProjectItem ReplaceParameters="true" >tasks.json</ProjectItem>
       </Folder>
+      <Folder Name="img">
+        <ProjectItem TargetFileName="logo.png">logo.png</ProjectItem>
+      </Folder>
       <Folder Name="tasks">
         <Folder Name="ExampleTask">
           <ProjectItem ReplaceParameters="true" >ExampleTask.ps1</ProjectItem>

VSTSBuildTask/VSTSBuildTask.csproj

@@ -94,6 +94,7 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="gruntfile.js" />
+    <Content Include="img\logo.PNG" />
     <Content Include="tasks\ExampleTask\icon.png" />
     <Content Include="test\TestSpec.js" />
     <Content Include="VSOE.ico" />

VSTSBuildTask/gruntfile.js

@@ -12,8 +12,18 @@ module.exports = function (grunt) {
                 stdout: true,
                 stderr: true
             },
-            publish: {
-                command: "tfx build tasks upload --token <<YOURTOKEN>> --auth-type pat --task-path ./tasks/ExampleTask --service-url https://your.visualstudio.com.account",
+            publish_task: {
+                command: "tfx build tasks upload --token YOURTOKEN --auth-type pat --task-path ./tasks/ExampleTask --service-url https://your.visualstudio.com.account",
+                stdout: true,
+                stderr: true
+            },
+            publish_ext: {
+                command: "tfx extension publish --token YOURTOKEN --auth-type pat --service-url https://your.visualstudio.com.account",
+                stdout: true,
+                stderr: true
+            },
+            package: {
+                command: "tfx extension create --manifest-globs vss-extension.json",
                 stdout: true,
                 stderr: true
             }

VSTSBuildTask/package.json

@@ -1,14 +1,14 @@
-{
-  "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-contrib-copy": "~0.8.2",
-    "grunt-contrib-jasmine": "^0.9.2",
-    "grunt-exec": "~0.4.6",
-    "jasmine": "~2.3.2",
-    "tfx-cli": "^0.3.13",
-    "vss-web-extension-sdk": "~1.95.2"
-  },
-  "name": "",
-  "private": true,
-  "version": "0.0.0"
-}
+{
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "grunt-contrib-copy": "~0.8.2",
+    "grunt-contrib-jasmine": "^0.9.2",
+    "grunt-exec": "~0.4.6",
+    "jasmine": "~2.3.2",
+    "tfx-cli": "^0.3.14",
+    "vss-web-extension-sdk": "~1.95.2"
+  },
+  "name": "",
+  "private": true,
+  "version": "0.0.0"
+}

VSTSBuildTask/vss-extension.json

@@ -45,36 +45,21 @@
   },
   "files": [
     {
-      "path": "css",
-      "addressable": true
-    },
-    {
-      "path": "img",
-      "addressable": true
-    },
-    {
-      "path": "scripts",
-      "addressable": true
-    },
-    {
-      "path": "index.html",
-      "addressable": true
+      "path": "tasks/ExampleTask"
     }
   ],
   "categories": [
-    "Integrate"
+    "Build and release"
   ],
   "contributions": [
     {
-      "id": "home",
+      "id": "example-task",
       "targets": [
-        "ms.vss-work-web.work-hub-group"
+        "ms.vss-distributed-task.tasks"
       ],
-      "type": "ms.vss-web.hub",
+      "type": "ms.vss-distributed-task.task",
       "properties": {
-        "name": "Sample Contribution",
-        "order": 100,
-        "uri": "index.html"
+        "name": "Example Task"
       }
     }
   ]

VSTSExt/package.json

@@ -1,15 +1,15 @@
-{
-  "devDependencies": {
-    "grunt": "~0.4.5",
-    "grunt-contrib-copy": "~0.8.2",
-    "grunt-contrib-jasmine": "^0.9.2",
-    "grunt-exec": "~0.4.6",
-    "jasmine": "~2.3.2",
-    "tfx-cli": "^0.3.13",
-    "tsd": "~0.6.5",
-    "vss-web-extension-sdk": "~1.95.2"
-  },
-  "name": "",
-  "private": true,
-  "version": "0.0.0"
-}
+{
+  "devDependencies": {
+    "grunt": "~0.4.5",
+    "grunt-contrib-copy": "~0.8.2",
+    "grunt-contrib-jasmine": "^0.9.2",
+    "grunt-exec": "~0.4.6",
+    "jasmine": "~2.3.2",
+    "tfx-cli": "^0.3.14",
+    "tsd": "~0.6.5",
+    "vss-web-extension-sdk": "~1.95.2"
+  },
+  "name": "",
+  "private": true,
+  "version": "0.0.0"
+}

VSTSExtensionPackage/ReleaseNotes.txt

@@ -1,6 +1,8 @@
 Release Notes
 =============
 
+* Version 2.2: Updating manifest for build extension to highlight specifics on task contributions; modified gruntfile to allow for task publish, extension package, and extension publish
+* Version 2.1.1: Fix for invalid syntax
 * Version 2.1: Updated reference to vss-sdk to vss-web-extension-sdk
 * Version 2.0: Added new project template for Build/Release tasks, new item template for Build/Release task
 * Version 1.11: Updated to include App Insights telemetry capture example in index.html; updated gruntfile to show full command for tfx publish

VSTSExtensionPackage/source.extension.vsixmanifest

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="VSTSExtensionPackage.Josh Garverick.75fb4c69-9081-453d-83e1-99024cdf668b" Version="2.1.1" Language="en-US" Publisher="Josh Garverick" />
+    <Identity Id="VSTSExtensionPackage.Josh Garverick.75fb4c69-9081-453d-83e1-99024cdf668b" Version="2.2" Language="en-US" Publisher="Josh Garverick" />
     <DisplayName>VSTS Extension Project Templates</DisplayName>
     <Description xml:space="preserve">This extension contains Visual Studio project templates supplying you with everything you need to create a Visual Studio Team Services extension or a custom VSTS build/release task.</Description>
     <MoreInfo>https://github.com/jgarverick/vsts-ext-proj-templates</MoreInfo>