Merge pull request #9 from jgarverick/develop

Version 2.5
jgarverick · Sep 10, 2016 · 705d91c · 705d91c
2 parents 4715856 + ff4587d
commit 705d91c
Show file tree

Hide file tree

Showing 14 changed files with 433 additions and 23 deletions.
diff --git a/BuildReleaseTaskItem/task.json b/BuildReleaseTaskItem/task.json
@@ -40,7 +40,7 @@
   ],
   "instanceNameFormat": "$fileinputname$",
   "execution": {
-    "PowerShell": {
+    "PowerShell3": {
       "target": "$(currentDirectory)\\$fileinputname$.ps1",
       "argumentFormat": "",
       "workingDirectory": "$(currentDirectory)"

diff --git a/BuildReleaseTaskItem/task.ps1 b/BuildReleaseTaskItem/task.ps1
@@ -8,11 +8,14 @@ param(
 )
 
 Write-Host "Starting $fileinputname$"
+Trace-VstsEnteringInvocation $MyInvocation
 
 try {
 
 } catch {
 
+} finally {
+	Trace-VstsLeavingInvocation $MyInvocation
 }
 
 Write-Host "Ending $fileinputname$"
diff --git a/VSTSBuildTask/ExampleTask/ExampleTask.ps1 b/VSTSBuildTask/ExampleTask/ExampleTask.ps1
@@ -8,11 +8,14 @@ param(
 )
 
 Write-Host "Starting ExampleTask"
+Trace-VstsEnteringInvocation $MyInvocation
 
 try {
 
 } catch {
 
+} finally {
+	Trace-VstsLeavingInvocation $MyInvocation
 }
 
 Write-Host "Ending ExampleTask"
diff --git a/VSTSBuildTask/ExampleTask/task.json b/VSTSBuildTask/ExampleTask/task.json
@@ -40,7 +40,7 @@
   ],
   "instanceNameFormat": "ExampleTask",
   "execution": {
-    "PowerShell": {
+    "PowerShell3": {
       "target": "$(currentDirectory)\\ExampleTask.ps1",
       "argumentFormat": "",
       "workingDirectory": "$(currentDirectory)"

diff --git a/VSTSBuildTask/gruntfile.js b/VSTSBuildTask/gruntfile.js
@@ -24,7 +24,7 @@ module.exports = function (grunt) {
                 stderr: true
             },
             package: {
-                command: "tfx extension create --manifest-globs vss-extension.json",
+                command: "tfx extension create --manifest-globs <%= settings.package.manifestGlobs %>",
                 stdout: true,
                 stderr: true
             }

diff --git a/VSTSBuildTask/package.json b/VSTSBuildTask/package.json
@@ -1,13 +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.4.1",
-    "tfx-cli": "^0.3.15",
-    "tsd": "^0.6.5",
-    "vss-web-extension-sdk": "^1.98.0"
+    "grunt": "^1.0.0",
+    "grunt-contrib-copy": "*",
+    "grunt-contrib-jasmine": "*",
+    "grunt-exec": "*",
+    "jasmine": "^2.5.1",
+    "tfx-cli": "^0.3.30",
+    "typings": "^1.3.3",
+    "vss-web-extension-sdk": "^1.98.0",
+    "vsts-task-sdk": "^0.6.4"
   },
   "name": "",
   "private": true,

diff --git a/VSTSExt/ProjectTemplateTS.vstemplate b/VSTSExt/ProjectTemplateTS.vstemplate
@@ -46,6 +46,9 @@
         <Folder Name="q" TargetFolderName="q">
           <ProjectItem ReplaceParameters="true" TargetFileName="Q.d.ts">Q.d.ts</ProjectItem>
         </Folder>
+<Folder Name="requirejs" TargetFolderName="requirejs">
+          <ProjectItem ReplaceParameters="true" TargetFileName="require.d.ts">require.d.ts</ProjectItem>
+        </Folder>
         <ProjectItem ReplaceParameters="true" TargetFileName="tsd.d.ts">tsd.d.ts</ProjectItem>
 
       </Folder>

diff --git a/VSTSExt/VSTSExt.csproj b/VSTSExt/VSTSExt.csproj
@@ -110,6 +110,7 @@
     <TypeScriptCompile Include="typings\jquery\jquery.d.ts" />
     <TypeScriptCompile Include="typings\knockout\knockout.d.ts" />
     <TypeScriptCompile Include="typings\q\Q.d.ts" />
+    <TypeScriptCompile Include="typings\requirejs\require.d.ts" />
     <TypeScriptCompile Include="typings\tsd.d.ts" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/VSTSExt/VSTSExtension.csproj b/VSTSExt/VSTSExtension.csproj
@@ -57,6 +57,7 @@
     <TypeScriptCompile Include="typings\jquery\jquery.d.ts" />
     <TypeScriptCompile Include="typings\q\q.d.ts" />
     <TypeScriptCompile Include="typings\knockout\knockout.d.ts" />
+<TypeScriptCompile Include="typings\requirejs\require.d.ts" />
     <TypeScriptCompile Include="typings\tsd.d.ts" />
   </ItemGroup>
   <ItemGroup>

diff --git a/VSTSExt/gruntfile.js b/VSTSExt/gruntfile.js
@@ -9,7 +9,7 @@ module.exports = function (grunt) {
         settings: grunt.file.readJSON("settings.tfx.json"),
         exec: {
             package: {
-                command: "tfx extension create --manifest-globs vss-extension.json",
+                command: "tfx extension create --manifest-globs <%= settings.package.manifestGlobs %>",
                 stdout: true,
                 stderr: true
             },
@@ -19,17 +19,17 @@ module.exports = function (grunt) {
                 stderr: true
             },
 			tsdinit:{
-				command: "tsd install jquery q knockout",
+				command: "typings install knockout requirejs",
                 stdout: true,
                 stderr: true
 			},
 			tsdlink:{
-				command: "tsd link",
+				command: "typings init",
                 stdout: true,
                 stderr: true
 			},
             publish: {
-                command: "tfx extension publish --manifest-globs vss-extension.json --share-with <%= settings.publish.shareWith %> --token <%= settings.publish.token %>",
+                command: "tfx extension publish --manifest-globs <%= settings.package.manifestGlobs %> --share-with <%= settings.publish.shareWith %> --token <%= settings.publish.token %>",
                 stdout: true,
                 stderr: true
             }

diff --git a/VSTSExt/package.json b/VSTSExt/package.json
@@ -1,12 +1,12 @@
 {
   "devDependencies": {
-    "grunt": "^0.4.5",
-    "grunt-contrib-copy": "^0.8.2",
-    "grunt-contrib-jasmine": "^0.9.2",
-    "grunt-exec": "^0.4.6",
-    "jasmine": "^2.4.1",
-    "tfx-cli": "^0.3.15",
-    "tsd": "^0.6.5",
+    "grunt": "^1.0.0",
+    "grunt-contrib-copy": "*",
+    "grunt-contrib-jasmine": "*",
+    "grunt-exec": "*",
+    "jasmine": "^2.5.1",
+    "tfx-cli": "^0.3.30",
+    "typings": "^1.3.3",
     "vss-web-extension-sdk": "^1.98.0"
   },
   "name": "",