From 71b76b74e6ac32313ea980b2fdbd92c72bce3503 Mon Sep 17 00:00:00 2001 From: Shreyas R Date: Fri, 29 Jun 2018 13:24:28 +0530 Subject: [PATCH] revert commit merge conflicts resolved --- Tasks/VsTestV2/runvstest.ts | 9 +++++++-- Tasks/VsTestV2/task.json | 2 +- Tasks/VsTestV2/task.loc.json | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Tasks/VsTestV2/runvstest.ts b/Tasks/VsTestV2/runvstest.ts index 46f40ecd8553..48a8b97bd69a 100644 --- 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 index 1a62ab161169..4658713495a0 100644 --- 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 index 9ea9f32dd624..8dbf90afb108 100644 --- 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"