Add MSBuild V18 support to MSBuildV1 and VSBuildV1 (#21476)

sanjays-ms · web-flow · commit 7d3243adddd8 · 2025-11-28T11:28:38.000+05:30
* Update MSBuildV1 task to support selecting MSBuild V18 * Update NuGetCommandV2 task to support MSBuild V18 * Regenerate package-lock.json to resolve inconsistent builds * Add support for Visual Studio 2026 (MSBuild V18) in VSBuildV1 task * Revert "Regenerate package-lock.json to resolve inconsistent builds" This reverts commit d914ad5. * Revert "Update NuGetCommandV2 task to support MSBuild V18" This reverts commit 30bd04d. * Update MSBuild task version to 1.267.0 and update package dependencies * Update VSBuild task to version 1.267.0 and update package dependencies * Add tests for Visual Studio version 18 support in VSBuild task
diff --git a/Tasks/MSBuildV1/package-lock.json b/Tasks/MSBuildV1/package-lock.json
diff --git a/Tasks/MSBuildV1/package.json b/Tasks/MSBuildV1/package.json
@@ -19,7 +19,7 @@
     "@types/mocha": "^9.1.1",
     "@types/node": "^20.3.1",
     "azure-pipelines-task-lib": "^4.16.0",
-    "azure-pipelines-tasks-msbuildhelpers": "3.259.1"
+    "azure-pipelines-tasks-msbuildhelpers": "3.266.0"
   },
   "devDependencies": {
     "typescript": "5.1.6"
diff --git a/Tasks/MSBuildV1/task.json b/Tasks/MSBuildV1/task.json
@@ -12,7 +12,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 260,
+    "Minor": 267,
     "Patch": 0
   },
   "demands": [
@@ -56,6 +56,7 @@
       "visibleRule": "msbuildLocationMethod = version",
       "options": {
         "latest": "Latest",
+        "18.0": "MSBuild 18.0",
         "17.0": "MSBuild 17.0",
         "16.0": "MSBuild 16.0",
         "15.0": "MSBuild 15.0",
diff --git a/Tasks/MSBuildV1/task.loc.json b/Tasks/MSBuildV1/task.loc.json
@@ -12,7 +12,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 260,
+    "Minor": 267,
     "Patch": 0
   },
   "demands": [
@@ -56,6 +56,7 @@
       "visibleRule": "msbuildLocationMethod = version",
       "options": {
         "latest": "Latest",
+        "18.0": "MSBuild 18.0",
         "17.0": "MSBuild 17.0",
         "16.0": "MSBuild 16.0",
         "15.0": "MSBuild 15.0",
diff --git a/Tasks/VSBuildV1/Get-VSPath.ps1 b/Tasks/VSBuildV1/Get-VSPath.ps1
@@ -4,12 +4,12 @@ function Get-VSPath {
         [Parameter(Mandatory = $true)]
         [string]$Version)        
         
-    $Versions = @('10.0', '11.0', '12.0','14.0','15.0', '16.0', '17.0')
+    $Versions = @('10.0', '11.0', '12.0','14.0','15.0', '16.0', '17.0', '18.0')
     Trace-VstsEnteringInvocation $MyInvocation
 
     try {
         if ( !($Version -in $Versions )) {
-            Write-Warning "Please enter one of the versions 10.0, 11.0, 12.0, 14.0, 15.0, 16.0, 17.0" 
+            Write-Warning "Please enter one of the versions 10.0, 11.0, 12.0, 14.0, 15.0, 16.0, 17.0, 18.0" 
         } else { 
             $VersionNumber = [int]$Version.Remove(2)
             # Search for more than 15.0 Willow instance.
diff --git a/Tasks/VSBuildV1/Select-VSVersion.ps1 b/Tasks/VSBuildV1/Select-VSVersion.ps1
@@ -5,7 +5,7 @@ function Select-VSVersion {
     Trace-VstsEnteringInvocation $MyInvocation
     try {
         $specificVersion = $PreferredVersion -and $PreferredVersion -ne 'latest'
-        $versions = '17.0', '16.0', '15.0', '14.0', '12.0', '11.0', '10.0' | Where-Object { $_ -ne $PreferredVersion }
+        $versions = '18.0', '17.0', '16.0', '15.0', '14.0', '12.0', '11.0', '10.0' | Where-Object { $_ -ne $PreferredVersion }
 
         # Look for a specific version of Visual Studio.
         if ($specificVersion) {
diff --git a/Tasks/VSBuildV1/Tests/L0.ts b/Tasks/VSBuildV1/Tests/L0.ts
@@ -39,6 +39,9 @@ describe('VSBuild Suite', function () {
         it('(Select-VSVersion) falls back from 17', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FallsBackFrom17.ps1'), done);
         })
+        it('(Select-VSVersion) falls back from 18', (done) => {
+            psr.run(path.join(__dirname, 'Select-VSVersion.FallsBackFrom18.ps1'), done);
+        })
         it('(Select-VSVersion) falls forward from 12', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FallsForwardFrom12.ps1'), done);
         })
@@ -51,6 +54,12 @@ describe('VSBuild Suite', function () {
         it('(Select-VSVersion) falls forward from 16', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FallsForwardFrom16.ps1'), done);
         })
+        it('(Select-VSVersion) falls forward from 17', (done) => {
+            psr.run(path.join(__dirname, 'Select-VSVersion.FallsForwardFrom17.ps1'), done);
+        })
+        it('(Select-VSVersion) finds 18', (done) => {
+            psr.run(path.join(__dirname, 'Select-VSVersion.Finds18.ps1'), done);
+        })
         it('(Select-VSVersion) finds latest', (done) => {
             psr.run(path.join(__dirname, 'Select-VSVersion.FindsLatest.ps1'), done);
         })
diff --git a/Tasks/VSBuildV1/Tests/MapsVSVersions.ps1 b/Tasks/VSBuildV1/Tests/MapsVSVersions.ps1
@@ -10,6 +10,7 @@ Register-Mock Invoke-BuildTools
 Register-Mock EmitTelemetry
 $mappings = @(
     @{ VSVersion = '' ; MSBuildVersion = '14.0' }
+    @{ VSVersion = '18.0' ; MSBuildVersion = '18.0' }
     @{ VSVersion = '17.0' ; MSBuildVersion = '17.0' }
     @{ VSVersion = '16.0' ; MSBuildVersion = '16.0' }
     @{ VSVersion = '15.0' ; MSBuildVersion = '15.0' }
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom14.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom14.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '14.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 5
+Assert-WasCalled Get-VSPath -Times 6
 Assert-AreEqual -Expected '12.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom15.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom15.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '15.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 4
+Assert-WasCalled Get-VSPath -Times 5
 Assert-AreEqual -Expected '14.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom16.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom16.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '16.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 3
+Assert-WasCalled Get-VSPath -Times 4
 Assert-AreEqual -Expected '15.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom17.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom17.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '17.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 2
+Assert-WasCalled Get-VSPath -Times 3
 Assert-AreEqual -Expected '16.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom18.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsBackFrom18.ps1
@@ -0,0 +1,16 @@
+[CmdletBinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\Select-VSVersion.ps1
+Register-Mock Write-Warning
+Register-Mock Get-VSPath { "Some resolved location" } -- -Version '17.0'
+
+# Act.
+$actual = Select-VSVersion -PreferredVersion '18.0'
+
+# Assert.
+Assert-WasCalled Write-Warning
+Assert-WasCalled Get-VSPath -Times 2
+Assert-AreEqual -Expected '17.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom12.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom12.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '12.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 5
+Assert-WasCalled Get-VSPath -Times 6
 Assert-AreEqual -Expected '14.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom14.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom14.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '14.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 4
+Assert-WasCalled Get-VSPath -Times 5
 Assert-AreEqual -Expected '15.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom15.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom15.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '15.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 3
+Assert-WasCalled Get-VSPath -Times 4
 Assert-AreEqual -Expected '16.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom16.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom16.ps1
@@ -12,5 +12,5 @@ $actual = Select-VSVersion -PreferredVersion '16.0'
 
 # Assert.
 Assert-WasCalled Write-Warning
-Assert-WasCalled Get-VSPath -Times 2
+Assert-WasCalled Get-VSPath -Times 3
 Assert-AreEqual -Expected '17.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom17.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.FallsForwardFrom17.ps1
@@ -0,0 +1,16 @@
+[CmdletBinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\Select-VSVersion.ps1
+Register-Mock Write-Warning
+Register-Mock Get-VSPath { "Some resolved location" } -- -Version '18.0'
+
+# Act.
+$actual = Select-VSVersion -PreferredVersion '17.0'
+
+# Assert.
+Assert-WasCalled Write-Warning
+Assert-WasCalled Get-VSPath -Times 2
+Assert-AreEqual -Expected '18.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/Tests/Select-VSVersion.Finds18.ps1 b/Tasks/VSBuildV1/Tests/Select-VSVersion.Finds18.ps1
@@ -0,0 +1,14 @@
+[CmdletBinding()]
+param()
+
+# Arrange.
+. $PSScriptRoot\..\..\..\Tests\lib\Initialize-Test.ps1
+. $PSScriptRoot\..\Select-VSVersion.ps1
+Register-Mock Get-VSPath { "Some resolved location" } -- -Version '18.0'
+
+# Act.
+$actual = Select-VSVersion -PreferredVersion '18.0'
+
+# Assert.
+Assert-WasCalled Get-VSPath -Times 1
+Assert-AreEqual -Expected '18.0' -Actual $actual
diff --git a/Tasks/VSBuildV1/VSBuild.ps1 b/Tasks/VSBuildV1/VSBuild.ps1
@@ -73,6 +73,7 @@ try {
     $msBuildVersion = $null;
     switch ("$vsVersion") {
         '' { $msBuildVersion = '14.0' ; break } # VS wasn't found. Attempt to find MSBuild 14.0 or lower.
+        '18.0' { $msBuildVersion = '18.0' ; break }
         '17.0' { $msBuildVersion = '17.0' ; break }
         '16.0' { $msBuildVersion = '16.0' ; break }
         '15.0' { $msBuildVersion = '15.0' ; break }
diff --git a/Tasks/VSBuildV1/package-lock.json b/Tasks/VSBuildV1/package-lock.json
diff --git a/Tasks/VSBuildV1/package.json b/Tasks/VSBuildV1/package.json
@@ -19,7 +19,7 @@
     "@types/mocha": "^5.2.7",
     "@types/node": "^10.17.0",
     "azure-pipelines-task-lib": "^4.16.0",
-    "azure-pipelines-tasks-msbuildhelpers": "^3.259.1"
+    "azure-pipelines-tasks-msbuildhelpers": "3.266.0"
   },
   "devDependencies": {
     "typescript": "4.0.2"
diff --git a/Tasks/VSBuildV1/task.json b/Tasks/VSBuildV1/task.json
@@ -12,7 +12,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 263,
+    "Minor": 267,
     "Patch": 0
   },
   "demands": [
@@ -45,6 +45,7 @@
       "defaultValue": "latest",
       "options": {
         "latest": "Latest",
+        "18.0": "Visual Studio 2026",
         "17.0": "Visual Studio 2022",
         "16.0": "Visual Studio 2019",
         "15.0": "Visual Studio 2017",
diff --git a/Tasks/VSBuildV1/task.loc.json b/Tasks/VSBuildV1/task.loc.json
@@ -12,7 +12,7 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 263,
+    "Minor": 267,
     "Patch": 0
   },
   "demands": [
@@ -45,6 +45,7 @@
       "defaultValue": "latest",
       "options": {
         "latest": "Latest",
+        "18.0": "Visual Studio 2026",
         "17.0": "Visual Studio 2022",
         "16.0": "Visual Studio 2019",
         "15.0": "Visual Studio 2017",
