VSTest task changes

README.md

@@ -70,4 +70,11 @@ gulp
 
 Tasks will be created in the _build directory.  It will also generate a tasks.loc.json and an english strings file under Strings in your source tree.  You can check these back in.  Another localization process will create the other strings files.
 
+### Package
+This must be done on a windows machine with nuget.exe in the path
+From the root of the repo (replace version with appropriate version)
+```bash
+gulp package --version 1.0.29
+```
 
+Tasks will be create a nuget package in the _package directory.

Tasks/NpmInstall/task.json

@@ -3,7 +3,7 @@
     "name": "NpmInstall",
     "friendlyName": "npm install",
     "description": "install npm packages",
-    "category": "Build",
+    "category": "Package",
     "author": "Microsoft Corporation",
     "version": {
         "Major": 0,

Tasks/NpmInstall/task.loc.json

@@ -6,7 +6,7 @@
   "name": "NpmInstall",
   "friendlyName": "ms-resource:loc.friendlyName",
   "description": "ms-resource:loc.description",
-  "category": "Build",
+  "category": "Package",
   "author": "Microsoft Corporation",
   "version": {
     "Major": 0,

Tasks/VsTest/Strings/resources.resjson/en-US/resources.resjson

@@ -7,6 +7,9 @@
   "loc.group.displayName.advanced": "Advanced",
   "loc.input.label.testAssembly": "Test Assembly",
   "loc.input.label.testFiltercriteria": "Test Filter criteria",
+  "loc.input.label.platform": "Platform",
+  "loc.input.label.configuration": "Configuration",
+  "loc.input.label.overrideTestrunParameters": "Override TestRun Parameters",
   "loc.input.label.runSettingsFile": "Run Settings File",
   "loc.input.label.codeCoverageEnabled": "Code Coverage Enabled",
   "loc.input.label.otherConsoleOptions": "Other console options",

Tasks/VsTest/VSTest.ps1

@@ -5,13 +5,18 @@ param(
     [string]$runSettingsFile,
     [string]$codeCoverageEnabled,
     [string]$pathtoCustomTestAdapters,
-    [string]$otherConsoleOptions
+    [string]$overrideTestrunParameters,
+    [string]$otherConsoleOptions,
+    [string]$platform,
+    [string]$configuration
 )
 
 Write-Verbose "Entering script VSTestConsole.ps1"
 
 # Import the Task.Common dll that has all the cmdlets we need for Build
 import-module "Microsoft.TeamFoundation.DistributedTask.Task.Common"
+# Import the Task.TestResults dll that has the cmdlet we need for publishing results
+import-module "Microsoft.TeamFoundation.DistributedTask.Task.TestResults"
 
 if (!$testAssembly)
 {
@@ -38,9 +43,17 @@ if($testAssemblyFiles)
 {
     Write-Verbose "Calling Invoke-VSTest for all test assemblies"
     $timeline = Start-Timeline -Context $distributedTaskContext
-	$cwd = Get-Location  
+    $projectName = Get-Variable -Context $distributedTaskContext -Name "System.TeamProject"
+    $buildDir = Get-Variable -Context $distributedTaskContext -Name "Agent.BuildDirectory" -Global $FALSE
+    $buildNumber = Get-Variable -Context $distributedTaskContext -Name "Build.BuildNumber"
+    $buildUri = Get-Variable -Context $distributedTaskContext -Name "Build.BuildUri"
+    $owner = Get-Variable -Context $distributedTaskContext -Name "Build.RequestedFor"	
+    $cwd = $buildDir
+    $testResultsDir = $buildDir+"\"+"TestResults"
     Write-Verbose "Calling Invoke-VSTest from working folder: $cwd"
-    Invoke-VSTest -TestAssemblies $testAssemblyFiles -Timeline $timeline -VSTestVersion $vsTestVersion -TestFiltercriteria $testFiltercriteria -RunSettingsFile $runSettingsFile -PathtoCustomTestAdapters $pathtoCustomTestAdapters -CodeCoverageEnabled $codeCoverage -OtherConsoleOptions $otherConsoleOptions -WorkingFolder $cwd
+    Invoke-VSTest -TestAssemblies $testAssemblyFiles -Timeline $timeline -VSTestVersion $vsTestVersion -TestFiltercriteria $testFiltercriteria -RunSettingsFile $runSettingsFile -PathtoCustomTestAdapters $pathtoCustomTestAdapters -CodeCoverageEnabled $codeCoverage -OverrideTestrunParameters $overrideTestrunParameters -OtherConsoleOptions $otherConsoleOptions -WorkingFolder $cwd -TestResultsFolder $testResultsDir
+    $connection = Get-VssConnection -TaskContext $distributedTaskContext
+    Invoke-ResultPublisher -Connection $connection -ProjectName $projectName -Owner $owner -TestResultsFolder $testResultsDir -Extension "trx" -ResultType "Trx" -BuildUri $buildUri -BuildNumber $buildNumber -Platform $platform -Configuration $configuration
 }
 else
 {

Tasks/VsTest/task.json

@@ -12,7 +12,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 8
+    "Patch": 9
   },
   "demands": [
     "vstest"
@@ -41,30 +41,45 @@
       "required": false,
       "helpMarkDown": "Filter criteria for the tests."
     },
+    {
+      "name": "platform", 
+      "type": "string", 
+      "label": "Platform", 
+      "defaultValue":"", 
+      "required":false
+    },
+    {
+      "name": "configuration", 
+      "type": "string", 
+      "label": "Configuration", 
+      "defaultValue":"", 
+      "required":false 
+    },
     {
       "name": "runSettingsFile",
       "type": "filePath",
       "label": "Run Settings File",
       "defaultValue": "",
       "required": false,
-      "helpMarkDown": "The run settings file to use."
+      "helpMarkDown": "Path to runsettings file to use with the Tests. Use $(agent.BuildDirectory)\\$(system.teamProject) to access the Project folder"
     },
     {
-      "name": "codeCoverageEnabled",
-      "type": "boolean",
-      "label": "Code Coverage Enabled",
-      "defaultValue": "True",
-      "required": false,
-      "helpMarkDown": "Whether code coverage needs to be enabled."
-    },
-    {
-      "name": "otherConsoleOptions",
+      "name": "overrideTestrunParameters",
       "type": "string",
-      "label": "Other console options",
+      "label": "Override TestRun Parameters",
       "defaultValue": "",
       "required": false,
-      "helpMarkDown": "Any other console options to be used."
+      "helpMarkDown": "Override parameters defined in the TestRunParameters section of runsettings file. For example: Platform=$(platform);Port=8080"      
     },
+    {
+      "name": "codeCoverageEnabled",
+      "type": "boolean",
+      "label": "Code Coverage Enabled",
+      "defaultValue": "False",
+      "required": false,
+      "helpMarkDown": "Whether code coverage needs to be enabled.",
+      "groupName":"advanced"
+    },    
     {
       "name": "vsTestVersion",
       "type": "pickList",
@@ -86,6 +101,15 @@
       "required": false,
       "helpMarkDown": "Path to custom adapters.",
       "groupName":"advanced"
+    },
+    {
+      "name": "otherConsoleOptions",
+      "type": "string",
+      "label": "Other console options",
+      "defaultValue": "",
+      "required": false,
+      "helpMarkDown": "Other console options.",
+      "groupName": "advanced"
     }
   ],
   "instanceNameFormat": "Test Assemblies $(testAssembly)",

Tasks/VsTest/task.loc.json

@@ -15,7 +15,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 8
+    "Patch": 9
   },
   "demands": [
     "vstest"
@@ -44,29 +44,44 @@
       "required": false,
       "helpMarkDown": "Filter criteria for the tests."
     },
+    {
+      "name": "platform", 
+      "type": "string", 
+      "label": "ms-resource:loc.input.label.platform", 
+      "defaultValue":"", 
+      "required":false
+    },
+    {
+      "name": "configuration", 
+      "type": "string", 
+      "label": "ms-resource:loc.input.label.configuration", 
+      "defaultValue":"", 
+      "required":false 
+    },
     {
       "name": "runSettingsFile",
       "type": "filePath",
       "label": "ms-resource:loc.input.label.runSettingsFile",
       "defaultValue": "",
       "required": false,
-      "helpMarkDown": "The run settings file to use."
+      "helpMarkDown": "Path to runsettings file to use with the Tests. Use $(agent.BuildDirectory)\\$(system.teamProject) to access the Project folder"
+    },
+    {
+      "name": "overrideTestrunParameters",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.overrideTestrunParameters",
+      "defaultValue": "",
+      "required": false,
+      "helpMarkDown": "Override parameters defined in the TestRunParameters section of runsettings file. For example: Platform=$(platform);Port=8080"
     },
     {
       "name": "codeCoverageEnabled",
       "type": "boolean",
       "label": "ms-resource:loc.input.label.codeCoverageEnabled",
       "defaultValue": "True",
       "required": false,
-      "helpMarkDown": "Whether code coverage needs to be enabled."
-    },
-    {
-      "name": "otherConsoleOptions",
-      "type": "string",
-      "label": "ms-resource:loc.input.label.otherConsoleOptions",
-      "defaultValue": "",
-      "required": false,
-      "helpMarkDown": "Any other console options to be used."
+      "helpMarkDown": "Whether code coverage needs to be enabled.",
+      "groupName":"advanced"
     },
     {
       "name": "vsTestVersion",
@@ -89,6 +104,15 @@
       "required": false,
       "helpMarkDown": "Path to custom adapters.",
       "groupName": "advanced"
+    },
+    {
+      "name": "otherConsoleOptions",
+      "type": "string",
+      "label": "ms-resource:loc.input.label.otherConsoleOptions",
+      "defaultValue": "",
+      "required": false,
+      "helpMarkDown": "Other console options.",
+      "groupName": "advanced"
     }
   ],
   "instanceNameFormat": "Test Assemblies $(testAssembly)",

gulpfile.js

@@ -90,13 +90,9 @@ gulp.task('package', ['zip'], function(done) {
 	if (!semver.valid(version)) {
 		done(new gutil.PluginError('PackageTask', 'invalid semver version: ' + version));
 		return;				
-	}
+	}	
 
 	var server = options.server;
-	if (!server) {
-		done(new gutil.PluginError('PackageTask', 'supply nuget server with --server'));
-		return;		
-	}
 
 	shell.mkdir('-p', _pkgRoot);
 
@@ -126,9 +122,16 @@ gulp.task('package', ['zip'], function(done) {
 		var cmdline = '"' + nugetPath + '" pack ' + nuspecPath + ' -OutputDirectory ' + _pkgRoot;
 		QExec(cmdline)
 		.then(function() {
-			var pkgLocation = path.join(_pkgRoot, pkgName + '.' + version + '.nupkg');
-			var cmdline = '"' + nugetPath + '" push ' + pkgLocation + ' -Source ' + server;
-			return QExec(cmdline);
+			// publish only if version and source supplied - used by CI server that does official publish
+			if (server) {
+				var pkgLocation = path.join(_pkgRoot, pkgName + '.' + version + '.nupkg');
+				var cmdline = '"' + nugetPath + '" push ' + pkgLocation + ' -Source ' + server;
+				return QExec(cmdline);				
+			}
+			else {
+				return;
+			}
+
 		})
 		.then(function() {
 			done();