Users/shreyas r msft/tia fixin135 for135 (#7320)

* resolved stash apply conflict

* fixed tia

Author: ShreyasRmsft

Tasks/VsTest/inputparser.ts

@@ -103,7 +103,7 @@ function getTestSelectionInputs(inputDataContract : idc.InputDataContract) : idc
 
 function getTfsSpecificSettings(inputDataContract : idc.InputDataContract) : idc.InputDataContract {
         inputDataContract.TfsSpecificSettings = <idc.TfsSpecificSettings>{};
-        inputDataContract.TfsSpecificSettings.DefinitionId = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('Release.DefinitionId')) ? Number(tl.getVariable('System.DefinitionId')) : Number(tl.getVariable('Release.ReleaseId'));
+        inputDataContract.TfsSpecificSettings.DefinitionId = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('Release.DefinitionId')) ? Number(tl.getVariable('System.DefinitionId')) : Number(tl.getVariable('Release.DefinitionId'));
         inputDataContract.TfsSpecificSettings.BuildId = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('Build.Buildid')) ? null : Number(tl.getVariable('Build.Buildid'));
         inputDataContract.TfsSpecificSettings.BuildUri = tl.getVariable('Build.BuildUri');
         inputDataContract.TfsSpecificSettings.ReleaseId = utils.Helper.isNullEmptyOrUndefined(tl.getVariable('Release.ReleaseId')) ? null : Number(tl.getVariable('Release.ReleaseId'));

Tasks/VsTest/make.json

@@ -6,7 +6,7 @@
                 "dest": "./"
             },
             {
-                "url": "https://testexecution.blob.core.windows.net/testexecution/6195043/TestAgent.zip",
+                "url": "https://testexecution.blob.core.windows.net/testexecution/6255884/TestAgent.zip",
                 "dest": "./Modules"
             },
             {

Tasks/VsTest/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 136,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [
         "vstest"

Tasks/VsTest/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 136,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [
     "vstest"
@@ -462,26 +462,29 @@
       "visibleRule": "rerunFailedTests = true"
     }
   ],
-  "sourceDefinitions": [
+  "dataSourceBindings": [
     {
       "target": "testPlan",
-      "endpoint": "/$(system.teamProject)/_apis/test/plans?filterActivePlans=true&api-version=3.0-preview.2",
-      "selector": "jsonpath:$.value[*].name",
-      "keySelector": "jsonpath:$.value[*].id",
-      "authKey": "tfs:teamfoundation"
+      "endpointId": "tfs:teamfoundation",
+      "endpointUrl": "{{endpoint.url}}/{{system.teamProject}}/_apis/test/plans?filterActivePlans=true&api-version=3.0-preview.2&$skip={{skip}}&$top=1000",
+      "resultSelector": "jsonpath:$.value[*]",
+      "resultTemplate": "{ \"Value\" : \"{{{id}}}\", \"DisplayValue\" : \"{{{id}}} - {{{name}}}\" }",
+      "callbackContextTemplate": "{\"skip\": \"{{add skip 1000}}\"}",
+      "callbackRequiredTemplate": "{{isEqualNumber result.count 1000}}",
+      "initialContextTemplate": "{\"skip\": \"0\"}"
     },
     {
       "target": "testConfiguration",
-      "endpoint": "/$(system.teamProject)/_apis/test/configurations?api-version=3.0-preview.1",
-      "selector": "jsonpath:$.value[*].name",
-      "keySelector": "jsonpath:$.value[*].id",
-      "authKey": "tfs:teamfoundation"
+      "endpointId": "tfs:teamfoundation",
+      "endpointUrl": "{{endpoint.url}}/{{system.teamProject}}/_apis/test/configurations?api-version=3.0-preview.1",
+      "resultSelector": "jsonpath:$.value[*]",
+      "resultTemplate": "{ \"Value\" : \"{{{id}}}\", \"DisplayValue\" : \"{{{id}}} - {{{name}}}\" }"
     },
     {
       "target": "testSuite",
-      "endpoint": "/$(system.teamProject)/_apis/test/plans/$(testPlan)/suites?$asTreeView=true&api-version=3.0-preview.2",
-      "selector": "jsonpath:$.value[*]",
-      "authKey": "tfs:teamfoundation"
+      "endpointId": "tfs:teamfoundation",
+      "endpointUrl": "{{endpoint.url}}/{{system.teamProject}}/_apis/test/plans/{{testPlan}}/suites?$asTreeView=true&api-version=3.0-preview.2",
+      "resultSelector": "jsonpath:$.value[*]"
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",