[MSBuildHelpers, MSBuildV1, VSBuildV1, XamarinAndroidV1] Enable fix for MSBuild.Logger (#15496)

* enableOrphanedProjectsLogs=true for MSBuild.Logger

* MSBuildV1 package.json updated

* bump up msbuild task version

* bump up version for VSBuild and XamarinAndroid tasks

* enableOrphanedProjectsLogs=true added to tests

* common-npm-packages - update InvokeFunctions

* update common-npm-packages - MSBuildHelpers

* timeout changed from 20 sec to 30 sec

* bump version from 2.196.0 to 2.197.0

Co-authored-by: Alexander Smolyakov <[email protected]>

Author: rumyax

Tasks/Common/MSBuildHelpers/InvokeFunctions.ps1

@@ -108,7 +108,7 @@ function Invoke-MSBuild {
             # Hook up the custom logger.
             $loggerAssembly = "$PSScriptRoot\Microsoft.TeamFoundation.DistributedTask.MSBuild.Logger.dll"
             Assert-VstsPath -LiteralPath $loggerAssembly -PathType Leaf
-            $arguments = "$arguments /dl:CentralLogger,`"$loggerAssembly`";`"RootDetailId=$($detailId)|SolutionDir=$($solutionDirectory)`"*ForwardingLogger,`"$loggerAssembly`""
+            $arguments = "$arguments /dl:CentralLogger,`"$loggerAssembly`";`"RootDetailId=$($detailId)|SolutionDir=$($solutionDirectory)|enableOrphanedProjectsLogs=true`"*ForwardingLogger,`"$loggerAssembly`""
         }
 
         # Append additional arguments.

Tasks/Common/MSBuildHelpers/Tests/Invoke-MSBuild.CombinesMsbuildexe.ps1

@@ -19,7 +19,7 @@ $actual = & $module Invoke-MSBuild -ProjectFile 'Some project file' -NoTimelineL
 # Assert.
 Assert-WasCalled Assert-VstsPath -- -LiteralPath $expectedMSBuildPath -PathType Leaf
 Assert-WasCalled Assert-VstsPath -- -LiteralPath $expectedLoggerPath -PathType Leaf
-Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"Some project file`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=|SolutionDir=`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
+Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"Some project file`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=|SolutionDir=|enableOrphanedProjectsLogs=true`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
 Assert-WasCalled Write-VstsSetResult -Times 0
 Assert-AreEqual -Expected @(
         'Some output 1'

Tasks/Common/MSBuildHelpers/Tests/Invoke-MSBuild.FailsRootTimelineDetailOnExitCode.ps1

@@ -31,7 +31,7 @@ Assert-WasCalled Write-VstsLogDetail -ParametersEvaluator {
             $State -eq 'Initialized' -and
             $AsOutput -eq $true
     }
-Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=$script:rootDetailId|SolutionDir=C:\Some solution dir`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
+Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=$script:rootDetailId|SolutionDir=C:\Some solution dir|enableOrphanedProjectsLogs=true`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
 Assert-WasCalled Write-VstsSetResult -- -Result Failed -DoNotThrow
 Assert-AreEqual -Expected @(
         'Some output 1'

Tasks/Common/MSBuildHelpers/Tests/Invoke-MSBuild.OmitsTimelineDetail.ps1

@@ -20,7 +20,7 @@ $actual = & $module Invoke-MSBuild -ProjectFile $expectedProjectFile -NoTimeline
 # Assert.
 Assert-WasCalled Assert-VstsPath -- -LiteralPath $expectedMSBuildPath -PathType Leaf
 Assert-WasCalled Assert-VstsPath -- -LiteralPath $expectedLoggerPath -PathType Leaf
-Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=|SolutionDir=C:\Some solution dir`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
+Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=|SolutionDir=C:\Some solution dir|enableOrphanedProjectsLogs=true`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
 Assert-WasCalled Write-VstsSetResult -Times 0
 Assert-AreEqual -Expected @(
         'Some output 1'

Tasks/Common/MSBuildHelpers/Tests/Invoke-MSBuild.SkipsLogUploadIfMissing.ps1

@@ -24,7 +24,7 @@ $actual = & $module Invoke-MSBuild -ProjectFile $expectedProjectFile -NoTimeline
 # Assert.
 Assert-WasCalled Assert-VstsPath -- -LiteralPath $expectedMSBuildPath -PathType Leaf
 Assert-WasCalled Assert-VstsPath -- -LiteralPath $expectedLoggerPath -PathType Leaf
-Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /fl /flp:`"logfile=$expectedLogFile;verbosity=$expectedLogFileVerbosity`" /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=|SolutionDir=C:\Some solution dir`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
+Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /fl /flp:`"logfile=$expectedLogFile;verbosity=$expectedLogFileVerbosity`" /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=|SolutionDir=C:\Some solution dir|enableOrphanedProjectsLogs=true`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
 Assert-WasCalled Write-VstsSetResult -Times 0
 Assert-WasCalled Write-Host -Times 0
 Assert-AreEqual -Expected @(

Tasks/Common/MSBuildHelpers/Tests/Invoke-MSBuild.WritesRootTimelineDetail.ps1

@@ -31,7 +31,7 @@ Assert-WasCalled Write-VstsLogDetail -ParametersEvaluator {
             $State -eq 'Initialized' -and
             $AsOutput -eq $true
     }
-Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=$script:rootDetailId|SolutionDir=C:\Some solution dir`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
+Assert-WasCalled Invoke-VstsTool -- -FileName $expectedMSBuildPath -Arguments "`"$expectedProjectFile`" /nologo /nr:false /dl:CentralLogger,`"$expectedLoggerPath`";`"RootDetailId=$script:rootDetailId|SolutionDir=C:\Some solution dir|enableOrphanedProjectsLogs=true`"*ForwardingLogger,`"$expectedLoggerPath`"" -RequireExitCodeZero
 Assert-WasCalled Write-VstsSetResult -Times 0
 Assert-AreEqual -Expected @(
         'Some output 1'

Tasks/Common/MSBuildHelpers/Tests/L0.ts

@@ -9,7 +9,7 @@ var psm = require('../../../../Tests/lib/psRunner');
 var psr = null;
 
 describe('Common-MSBuildHelpers Suite', function () {
-    this.timeout(parseInt(process.env.TASK_TEST_TIMEOUT) || 20000);
+    this.timeout(parseInt(process.env.TASK_TEST_TIMEOUT) || 30000);
 
     before((done) => {
         if (psm.testSupported()) {

Tasks/Common/MSBuildHelpers/make.json

@@ -2,7 +2,7 @@
     "externals": {
         "archivePackages": [
             {
-                "url": "https://vstsagenttools.blob.core.windows.net/tools/msbuildlogger/4/msbuildlogger.zip",
+                "url": "https://vstsagenttools.blob.core.windows.net/tools/msbuildlogger/5/msbuildlogger.zip",
                 "dest": "./"
             },
             {

Tasks/Common/MSBuildHelpers/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "msbuildhelpers",
-  "version": "1.192.1",
+  "version": "1.197.0",
   "description": "Azure Pipelines tasks MSBuild helpers",
   "main": "msbuildhelpers.js",
   "scripts": {