Fixing Get-MSBuildPathV2 for version < 15 (#447)

Author: praval-microsoft

common-npm-packages/azure-arm-rest/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "azure-pipelines-tasks-azure-arm-rest",
-  "version": "3.254.2",
+  "version": "3.256.0",
   "description": "Common Lib for Azure ARM REST apis",
   "repository": {
     "type": "git",

common-npm-packages/azure-arm-rest/package.json

@@ -187,7 +187,6 @@ function Get-MSBuildPathV2 {
             Write-Debug "Exception caught while parsing VersionNumber : $_"
         }
 
-        $specifiedStudio = Get-VisualStudio $VersionNumber
         if (($VersionNumber -ge 15 -or !$Version) -and # !$Version indicates "latest"
             ($specifiedStudio = Get-VisualStudio $VersionNumber) -and
             $specifiedStudio.installationPath) {

common-npm-packages/msbuildhelpers/PathFunctions.ps1

@@ -13,4 +13,6 @@ Assert-WasCalled Get-MSBuildPath -- -Version '15.0' -Architecture 'Some architec
 Assert-WasCalled Get-MSBuildPath -- -Version '14.0' -Architecture 'Some architecture'
 Assert-WasCalled Get-MSBuildPath -- -Version '12.0' -Architecture 'Some architecture'
 Assert-WasCalled Get-MSBuildPath -- -Version '4.0' -Architecture 'Some architecture'
-Assert-WasCalled Get-MSBuildPath -Times 6
+
+$expectedCallCount = if ($env:MSBUILDHELPERS_ENABLE_TELEMETRY -eq "true") { 12 } else { 6 }
+Assert-WasCalled Get-MSBuildPath -Times $expectedCallCount

common-npm-packages/msbuildhelpers/Tests/Select-MSBuildPath.ErrorsIfVersionNotFound.ps1

@@ -12,5 +12,8 @@ $actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '1
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-MSBuildPath -Times 5
+
+$expectedCallCount = if ($env:MSBUILDHELPERS_ENABLE_TELEMETRY -eq "true") { 10 } else { 5 }
+Assert-WasCalled Get-MSBuildPath -Times $expectedCallCount
+
 Assert-AreEqual -Expected 'Some resolved location' -Actual $actual

common-npm-packages/msbuildhelpers/Tests/Select-MSBuildPath.FallsBackFrom14.ps1

@@ -12,5 +12,8 @@ $actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '1
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-MSBuildPath -Times 4
+
+$expectedCallCount = if ($env:MSBUILDHELPERS_ENABLE_TELEMETRY -eq "true") { 8 } else { 4 }
+Assert-WasCalled Get-MSBuildPath -Times $expectedCallCount
+
 Assert-AreEqual -Expected 'Some resolved location' -Actual $actual

common-npm-packages/msbuildhelpers/Tests/Select-MSBuildPath.FallsBackFrom15.ps1

@@ -12,5 +12,8 @@ $actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '1
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-MSBuildPath -Times 5
+
+$expectedCallCount = if ($env:MSBUILDHELPERS_ENABLE_TELEMETRY -eq "true") { 10 } else { 5 }
+Assert-WasCalled Get-MSBuildPath -Times $expectedCallCount
+
 Assert-AreEqual -Expected 'Some resolved location' -Actual $actual

common-npm-packages/msbuildhelpers/Tests/Select-MSBuildPath.FallsForwardFrom12.ps1

@@ -12,5 +12,8 @@ $actual = Select-MSBuildPath -Method 'Version' -Location '' -PreferredVersion '1
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-MSBuildPath -Times 4
+
+$expectedCallCount = if ($env:MSBUILDHELPERS_ENABLE_TELEMETRY -eq "true") { 8 } else { 4 }
+Assert-WasCalled Get-MSBuildPath -Times $expectedCallCount
+
 Assert-AreEqual -Expected 'Some resolved location' -Actual $actual

common-npm-packages/msbuildhelpers/Tests/Select-MSBuildPath.FallsForwardFrom14.ps1

@@ -13,5 +13,7 @@ foreach ($version in @('', 'latest')) {
 
     # Assert.
     Assert-AreEqual -Expected 'Some resolved location' -Actual $actual
-    Assert-WasCalled Get-MSBuildPath -Times 2
+
+    $expectedCallCount = if ($env:MSBUILDHELPERS_ENABLE_TELEMETRY -eq "true") { 4 } else { 2 }
+    Assert-WasCalled Get-MSBuildPath -Times $expectedCallCount
 }