Merge pull request #7 from jgarverick/develop

Version 2.3
jgarverick · Feb 27, 2016 · 75abca6 · 75abca6
2 parents c35e439 + 82a5aef
commit 75abca6
Show file tree

Hide file tree

Showing 18 changed files with 37 additions and 29 deletions.
diff --git a/...ildTask/tasks/ExampleTask/ExampleTask.ps1 → VSTSBuildTask/ExampleTask/ExampleTask.ps1 b/...ildTask/tasks/ExampleTask/ExampleTask.ps1 → VSTSBuildTask/ExampleTask/ExampleTask.ps1
diff --git a/VSTSBuildTask/tasks/ExampleTask/icon.png → VSTSBuildTask/ExampleTask/icon.png b/VSTSBuildTask/tasks/ExampleTask/icon.png → VSTSBuildTask/ExampleTask/icon.png
diff --git a/VSTSBuildTask/tasks/ExampleTask/task.json → VSTSBuildTask/ExampleTask/task.json b/VSTSBuildTask/tasks/ExampleTask/task.json → VSTSBuildTask/ExampleTask/task.json
diff --git a/VSTSBuildTask/ProjectTemplate.csproj b/VSTSBuildTask/ProjectTemplate.csproj
@@ -39,14 +39,15 @@
     <None Include="package.json" />
     <None Include="vss-extension.json"/>
     <None Include="img\logo.png"/>
+    <None Include="settings.tfx.json"/>
 		<Compile Include="Properties\AssemblyInfo.cs" />
 	</ItemGroup>
   <ItemGroup>
     <None Include=".vscode\tasks.json"/>
     <Content Include="test\TestSpec.js"/>
-    <Content Include="tasks\ExampleTask\ExampleTask.ps1"/>
-    <Content Include="tasks\ExampleTask\task.json" />
-    <Content Include="tasks\ExampleTask\icon.png"/>
+    <Content Include="ExampleTask\ExampleTask.ps1"/>
+    <Content Include="ExampleTask\task.json" />
+    <Content Include="ExampleTask\icon.png"/>
   </ItemGroup>
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <TypeScriptRemoveComments>false</TypeScriptRemoveComments>

diff --git a/VSTSBuildTask/VSOBuildTask.vstemplate b/VSTSBuildTask/VSOBuildTask.vstemplate
@@ -19,19 +19,20 @@
       <ProjectItem ReplaceParameters="true" >gruntfile.js</ProjectItem>
       <ProjectItem ReplaceParameters="true" >package.json</ProjectItem>
       <ProjectItem ReplaceParameters="true" >vss-extension.json</ProjectItem>
+      <ProjectItem TargetFileName="settings.tfx.json">settings.tfx.json</ProjectItem>
       <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>
           <ProjectItem ReplaceParameters="true" >icon.png</ProjectItem>
           <ProjectItem ReplaceParameters="true" >task.json</ProjectItem>
         </Folder>
-      </Folder>
+
       <Folder Name="test">
         <ProjectItem ReplaceParameters="true" >TestSpec.js</ProjectItem>
       </Folder>

diff --git a/VSTSBuildTask/VSTSBuildTask.csproj b/VSTSBuildTask/VSTSBuildTask.csproj
@@ -83,8 +83,9 @@
       <SubType>Designer</SubType>
     </None>
     <None Include="readme.md" />
-    <None Include="tasks\ExampleTask\task.json" />
-    <None Include="tasks\ExampleTask\ExampleTask.ps1" />
+    <None Include="settings.tfx.json" />
+    <None Include="ExampleTask\task.json" />
+    <None Include="ExampleTask\ExampleTask.ps1" />
     <None Include="vss-extension.json" />
   </ItemGroup>
   <ItemGroup>
@@ -95,7 +96,7 @@
   <ItemGroup>
     <Content Include="gruntfile.js" />
     <Content Include="img\logo.PNG" />
-    <Content Include="tasks\ExampleTask\icon.png" />
+    <Content Include="ExampleTask\icon.png" />
     <Content Include="test\TestSpec.js" />
     <Content Include="VSOE.ico" />
   </ItemGroup>

diff --git a/VSTSBuildTask/gruntfile.js b/VSTSBuildTask/gruntfile.js
@@ -6,19 +6,20 @@ Click here to learn more. http://go.microsoft.com/fwlink/?LinkID=513275&clcid=0x
 module.exports = function (grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON("package.json"),
+        settings: grunt.file.readJSON("settings.tfx.json"),
         exec: {
             update: {
                 command: "npm up --save-dev",
                 stdout: true,
                 stderr: true
             },
             publish_task: {
-                command: "tfx build tasks upload --token YOURTOKEN --auth-type pat --task-path ./tasks/ExampleTask --service-url https://your.visualstudio.com.account",
+                command: "tfx build tasks upload --token <%= settings.publish.token %> --auth-type pat --task-path ./ExampleTask --service-url <%= settings.serviceUrl %>",
                 stdout: true,
                 stderr: true
             },
             publish_ext: {
-                command: "tfx extension publish --token YOURTOKEN --auth-type pat --service-url https://your.visualstudio.com.account",
+                command: "tfx extension publish --token <%= settings.publish.token %> --auth-type pat --service-url <%= settings.serviceUrl %>",
                 stdout: true,
                 stderr: true
             },
@@ -29,7 +30,7 @@ module.exports = function (grunt) {
             }
         },
         jasmine: {
-            src: ["scripts/**/*.js", "sdk/scripts/*.js"],
+            src: ["scripts/**/*.js"],
             specs: "test/**/*[sS]pec.js",
             helpers: "test/helpers/*.js"
         }

diff --git a/VSTSBuildTask/package.json b/VSTSBuildTask/package.json
@@ -5,7 +5,7 @@
     "grunt-contrib-jasmine": "^0.9.2",
     "grunt-exec": "~0.4.6",
     "jasmine": "~2.3.2",
-    "tfx-cli": "^0.3.14",
+    "tfx-cli": "^0.3.15",
     "vss-web-extension-sdk": "~1.95.2"
   },
   "name": "",

diff --git a/VSTSBuildTask/settings.tfx.json b/VSTSBuildTask/settings.tfx.json
@@ -0,0 +1,11 @@
+{
+  "serviceUrl": "https://your.visualstudio.com.account",
+  "package": {
+    "manifestGlobs": [ "vss-extension.json" ]
+  },
+  "publish": {
+    "galleryUrl": "https://marketplace.visualstudio.com/",
+    "token": "xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx",
+    "shareWith": "youraccount"
+  }
+}
diff --git a/VSTSBuildTask/vss-extension.json b/VSTSBuildTask/vss-extension.json
@@ -45,7 +45,7 @@
   },
   "files": [
     {
-      "path": "tasks/ExampleTask"
+      "path": "ExampleTask"
     }
   ],
   "categories": [

diff --git a/VSTSExt/ProjectTemplateTS.vstemplate b/VSTSExt/ProjectTemplateTS.vstemplate
@@ -18,7 +18,7 @@
       <ProjectItem ReplaceParameters="false" TargetFileName="vss-extension.json">vss-extension.json</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="index.html">index.html</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="package.json">package.json</ProjectItem>
-      <ProjectItem ReplaceParameters="true" TargetFileName="settings.vset.json">settings.vset.json</ProjectItem>
+      <ProjectItem ReplaceParameters="true" TargetFileName="settings.tfx.json">settings.tfx.json</ProjectItem>
       <ProjectItem ReplaceParameters="true" TargetFileName="gruntfile.js">gruntfile.js</ProjectItem>
       <Folder Name=".vscode" TargetFolderName=".vscode">
         <ProjectItem ReplaceParameters="true" TargetFileName="tasks.json">tasks.json</ProjectItem>

diff --git a/VSTSExt/VSTSExt.csproj b/VSTSExt/VSTSExt.csproj
@@ -72,7 +72,7 @@
     <None Include=".vscode\tasks.json" />
     <None Include="AssemblyInfo.cs" />
     <None Include="package.json" />
-    <None Include="settings.vset.json" />
+    <None Include="settings.tfx.json" />
     <None Include="VSTSExtension.csproj">
       <SubType>Designer</SubType>
     </None>

diff --git a/VSTSExt/VSTSExtension.csproj b/VSTSExt/VSTSExtension.csproj
@@ -61,7 +61,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="vss-extension.json" />
-    <None Include="settings.vset.json" />
+    <None Include="settings.tfx.json" />
     <None Include="gruntfile.js" />
   </ItemGroup>
 

diff --git a/VSTSExt/gruntfile.js b/VSTSExt/gruntfile.js
@@ -6,6 +6,7 @@ Click here to learn more. http://go.microsoft.com/fwlink/?LinkID=513275&clcid=0x
 module.exports = function (grunt) {
     grunt.initConfig({
         pkg: grunt.file.readJSON("package.json"),
+        settings: grunt.file.readJSON("settings.tfx.json"),
         exec: {
             package: {
                 command: "tfx extension create --manifest-globs vss-extension.json",
@@ -28,7 +29,7 @@ module.exports = function (grunt) {
                 stderr: true
 			},
             publish: {
-                command: "tfx extension publish --manifest-globs vss-extension.json --share-with <<SHAREACCOUNT>> --token <<YOURACCESSTOKEN>>",
+                command: "tfx extension publish --manifest-globs vss-extension.json --share-with <%= settings.pubhlish.shareWith %> --token <%= settings.publish.token %>",
                 stdout: true,
                 stderr: true
             }

diff --git a/VSTSExt/package.json b/VSTSExt/package.json
@@ -5,7 +5,7 @@
     "grunt-contrib-jasmine": "^0.9.2",
     "grunt-exec": "~0.4.6",
     "jasmine": "~2.3.2",
-    "tfx-cli": "^0.3.14",
+    "tfx-cli": "^0.3.15",
     "tsd": "~0.6.5",
     "vss-web-extension-sdk": "~1.95.2"
   },

diff --git a/VSTSExt/settings.vset.json b/VSTSExt/settings.vset.json
diff --git a/VSTSExtensionPackage/ReleaseNotes.txt b/VSTSExtensionPackage/ReleaseNotes.txt
@@ -1,6 +1,8 @@
 Release Notes
 =============
 
+* Version 2.4: Added dashboard widget item template
+* Version 2.3: Added support for parameters with gruntfile
 * 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

diff --git a/VSTSExtensionPackage/source.extension.vsixmanifest b/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.2" Language="en-US" Publisher="Josh Garverick" />
+    <Identity Id="VSTSExtensionPackage.Josh Garverick.75fb4c69-9081-453d-83e1-99024cdf668b" Version="2.3" 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>