revert commit merge conflicts resolved

microsoft · Jun 29, 2018 · 71b76b7 · 71b76b7
1 parent 4cf2579
commit 71b76b7
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/Tasks/VsTestV2/runvstest.ts b/Tasks/VsTestV2/runvstest.ts
@@ -45,10 +45,15 @@ if (osPlat !== 'win32') {
             ci.publishEvent({ runmode: 'vstest' });
             const inputDataContract = inputParser.parseInputsForNonDistributedTestRun();
 
+            if (inputDataContract.ExecutionSettings
+                && inputDataContract.ExecutionSettings.TiaSettings
+                && inputDataContract.ExecutionSettings.TiaSettings.Enabled) {
+                    localtest.startTest();
+            }
+
             if (inputDataContract.ExecutionSettings
                 && inputDataContract.ExecutionSettings.RerunSettings
-                && inputDataContract.ExecutionSettings.RerunSettings.RerunFailedTests
-                && (inputDataContract.ExecutionSettings.TiaSettings && !inputDataContract.ExecutionSettings.TiaSettings.Enabled)) {
+                && inputDataContract.ExecutionSettings.RerunSettings.RerunFailedTests) {
                     nondistributedtest.runNonDistributedTest(inputDataContract);
             } else {
                 localtest.startTest();

diff --git a/Tasks/VsTestV2/task.json b/Tasks/VsTestV2/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 2,
         "Minor": 137,
-        "Patch": 7
+        "Patch": 5
     },
     "demands": [
         "vstest"

diff --git a/Tasks/VsTestV2/task.loc.json b/Tasks/VsTestV2/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 2,
     "Minor": 137,
-    "Patch": 7
+    "Patch": 5
   },
   "demands": [
     "vstest"