diff --git a/Tasks/VsTestV2/inputdatacontract.ts b/Tasks/VsTestV2/inputdatacontract.ts index 1bc4b75079a5..f70270bdf10b 100644 --- a/Tasks/VsTestV2/inputdatacontract.ts +++ b/Tasks/VsTestV2/inputdatacontract.ts @@ -98,6 +98,7 @@ export interface ExecutionSettings { PathToCustomTestAdapters : string; IgnoreTestFailures : boolean; ProceedAfterAbortedTestCase : boolean; + PathToCustomVsTestConsoleWrapperAssembly : string; SettingsFile : string; AdditionalConsoleParameters : string; OverridenParameters : string; @@ -133,4 +134,4 @@ export interface TiaSettings { export interface Logging { DebugLogging : boolean; EnableConsoleLogs : boolean; -} \ No newline at end of file +} diff --git a/Tasks/VsTestV2/inputparser.ts b/Tasks/VsTestV2/inputparser.ts index 3446e079990a..98cde68ced45 100644 --- a/Tasks/VsTestV2/inputparser.ts +++ b/Tasks/VsTestV2/inputparser.ts @@ -371,7 +371,10 @@ function getExecutionSettings(inputDataContract : idc.InputDataContract) : idc.I console.log(tl.loc('codeCoverageInput', inputDataContract.ExecutionSettings.CodeCoverageEnabled)); inputDataContract = getDiagnosticsSettings(inputDataContract); - console.log(tl.loc('diagnosticsInput', inputDataContract.ExecutionSettings.DiagnosticsSettings.Enabled)); + console.log(tl.loc('diagnosticsInput', inputDataContract.ExecutionSettings.DiagnosticsSettings.Enabled)); + + // Custom console wrapper settings + inputDataContract.ExecutionSettings.PathToCustomVsTestConsoleWrapperAssembly = tl.getVariable('vstest.customConsoleWrapperAssemblyLocation'); inputDataContract = getTiaSettings(inputDataContract); inputDataContract = getRerunSettings(inputDataContract); @@ -625,4 +628,4 @@ export function getDtaInstanceId(): number { } tl.setVariable('DTA_INSTANCE_ID', taskInstanceId.toString()); return taskInstanceId; -} \ No newline at end of file +} diff --git a/Tasks/VsTestV2/make.json b/Tasks/VsTestV2/make.json index 5f7baa4f37a3..3ecf5924adf1 100644 --- a/Tasks/VsTestV2/make.json +++ b/Tasks/VsTestV2/make.json @@ -6,7 +6,7 @@ "dest": "./" }, { - "url": "https://testexecution.blob.core.windows.net/testexecution/10525576/TestAgent.zip", + "url": "https://testexecution.blob.core.windows.net/testexecution/10713483/TestAgent.zip", "dest": "./Modules" }, { diff --git a/Tasks/VsTestV2/task.json b/Tasks/VsTestV2/task.json index 3a4af941948a..d264bb8c2d68 100644 --- a/Tasks/VsTestV2/task.json +++ b/Tasks/VsTestV2/task.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 159, + "Minor": 160, "Patch": 0 }, "demands": [ diff --git a/Tasks/VsTestV2/task.loc.json b/Tasks/VsTestV2/task.loc.json index 1c359efdfd5f..c9755bb3852d 100644 --- a/Tasks/VsTestV2/task.loc.json +++ b/Tasks/VsTestV2/task.loc.json @@ -17,7 +17,7 @@ "author": "Microsoft Corporation", "version": { "Major": 2, - "Minor": 159, + "Minor": 160, "Patch": 0 }, "demands": [