Fixing 'Run Task' Build for the legacy projects (#26337) (#26339)

* Fixing  'Run Task' Build for the legacy projects

* test updates

* duplicated problem matcher added during conflicts resolution and unnoticed

* removing the duplicated probem matcher while unnoticed conflicts resolution

Author: ssreerama

extensions/sql-database-projects/package.json

@@ -580,44 +580,6 @@
       }
     ]
   },
-  "problemMatchers": [
-    {
-      "name": "sqlproj-problem-matcher",
-      "owner": "sqlproj-builder",
-      "fileLocation": "absolute",
-      "pattern": {
-        "regexp": "^(.*\\.sql)\\((\\d+),(\\d+),(\\d+),(\\d+)\\):\\s+\\w+\\s+(warning|error)\\s+(\\w+):\\s+(.*?)?$",
-        "file": 1,
-        "line": 2,
-        "column": 3,
-        "severity": 6,
-        "code": 7,
-        "message": 8
-      }
-    }
-  ],
-  "taskDefinitions": [
-    {
-      "type": "sqlproj-build",
-      "required": [
-        "filePath"
-      ],
-      "properties": {
-        "filePath": {
-          "type": "string",
-          "description": "The path to the .sqlproj file."
-        },
-        "fileDisplayName": {
-          "type": "string",
-          "description": "The display name of the .sqlproj file."
-        },
-        "runCodeAnalysis": {
-          "type": "boolean",
-          "description": "Run code analysis on the SQLProj file. Optional, default is true."
-        }
-      }
-    }
-  ],
   "dependencies": {
     "@microsoft/ads-extension-telemetry": "^3.0.1",
     "@xmldom/xmldom": "0.8.4",
@@ -653,4 +615,4 @@
     "publisherDisplayName": "Microsoft",
     "publisherId": "Microsoft"
   }
-}
+}

extensions/sql-database-projects/src/controllers/projectController.ts

@@ -316,7 +316,7 @@ export class ProjectsController {
 			}
 		}
 
-		// Load tasks from tasks.json and create a new vscode.task if it exist
+		// Get the build arguments from buildhelper method and create a new vscode.task
 		const buildArgs: string[] = this.buildHelper.constructBuildArguments(this.buildHelper.extensionBuildDirPath, project.sqlProjStyle);
 		const vscodeTask: vscode.Task = await this.createVsCodeTask(project, codeAnalysis, buildArgs);
 

extensions/sql-database-projects/src/tasks/sqlDatabaseProjectTaskProvider.ts

@@ -7,6 +7,10 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import * as constants from '../common/constants';
 import * as utils from '../common/utils';
+import { Project } from '../models/project';
+import { ProjectType } from '../common/typeHelper';
+import { BuildHelper } from '../tools/buildHelper';
+
 
 /**
  * Extends to vscode.TaskDefinition to add task definition properties.
@@ -15,6 +19,7 @@ import * as utils from '../common/utils';
 interface SqlprojTaskDefinition extends vscode.TaskDefinition {
 	fileDisplayName: string;
 	filePath: string;
+	projectStyle: ProjectType;
 	runCodeAnalysis?: boolean;
 	workspaceFolder?: vscode.WorkspaceFolder;
 }
@@ -28,6 +33,7 @@ export class SqlDatabaseProjectTaskProvider implements vscode.TaskProvider {
 	private sqlTasks: Thenable<vscode.Task[]> | undefined = undefined;
 	private _onDidChangeTasks = new vscode.EventEmitter<void>();
 	private workspaceFoldersListener: vscode.Disposable | undefined;
+	private buildHelper: BuildHelper;
 
 	/**
 	 * Event that fires when the tasks change (e.g., when .sqlproj files are created, modified, or deleted)
@@ -40,6 +46,7 @@ export class SqlDatabaseProjectTaskProvider implements vscode.TaskProvider {
 	 * or deletions of `.sqlproj` files. When any of these events occur, the `sqlTasks` cache is invalidated.
 	 */
 	constructor() {
+		this.buildHelper = new BuildHelper();
 		// Watch for workspace folder changes
 		this.workspaceFoldersListener = vscode.workspace.onDidChangeWorkspaceFolders(() => {
 			this.invalidateTasks();
@@ -153,12 +160,16 @@ export class SqlDatabaseProjectTaskProvider implements vscode.TaskProvider {
 				// Add the file to the processed set to avoid duplicates
 				processedFiles.add(uri.fsPath);
 
+				// Determine project style once
+				const project = await Project.openProject(uri.fsPath);
+
 				// Create a task definition for the .sqlproj file
 				const taskDefinition: SqlprojTaskDefinition = {
 					type: constants.sqlProjTaskType,
 					filePath: utils.getNonQuotedPath(uri.fsPath),
 					fileDisplayName: path.basename(uri.fsPath),
-					workspaceFolder: workspaceFolder
+					workspaceFolder: workspaceFolder,
+					projectStyle: project.sqlProjStyle
 				};
 
 				// Create a Build task
@@ -184,6 +195,9 @@ export class SqlDatabaseProjectTaskProvider implements vscode.TaskProvider {
 		// Set the runCodeAnalysis flag in the definition
 		definition.runCodeAnalysis = runCodeAnalysis;
 
+		// Get the build arguments for the task
+		const buildArgs: string[] = this.buildHelper.constructBuildArguments(this.buildHelper.extensionBuildDirPath, definition.projectStyle);
+
 		// Construct the task name
 		const taskName = runCodeAnalysis
 			? `${definition.fileDisplayName} - ${constants.buildWithCodeAnalysisTaskName}`
@@ -193,6 +207,7 @@ export class SqlDatabaseProjectTaskProvider implements vscode.TaskProvider {
 		const args: string[] = [
 			constants.build,
 			definition.filePath, // vscode shell execution handles the quotes around the file path
+			...buildArgs
 		];
 
 		if (runCodeAnalysis) {

extensions/sql-database-projects/src/test/tasks/sqlDatabaseProjectTaskProvider.test.ts

@@ -7,6 +7,7 @@ import * as vscode from 'vscode';
 import * as sinon from 'sinon';
 import * as should from 'should';
 import * as path from 'path';
+import * as vscodeMssql from 'vscode-mssql';
 import { SqlDatabaseProjectTaskProvider } from '../../tasks/sqlDatabaseProjectTaskProvider';
 
 describe('Sql Database Projects Task Provider', function (): void {
@@ -33,6 +34,19 @@ describe('Sql Database Projects Task Provider', function (): void {
 		sandbox.stub(vscode.workspace, 'findFiles').resolves(sqlProjUri);
 	}
 
+	// Helper to create and stub a mock project
+	function stubProjectOpenWithStyle(projectStyle: vscodeMssql.ProjectType) {
+		const mockProject = {
+			sqlProjStyle: projectStyle,
+			readProjFile: sandbox.stub().resolves()
+		};
+
+		const projectModule = require('../../models/project');
+		sandbox.stub(projectModule.Project, 'openProject').resolves(mockProject);
+
+		return mockProject;
+	}
+
 	beforeEach(() => {
 		// Create a new Sinon sandbox before each test
 		sandbox = sinon.createSandbox();
@@ -45,10 +59,13 @@ describe('Sql Database Projects Task Provider', function (): void {
 		sandbox.restore();
 	});
 
-	it('Should create build and buildWithCodeAnalysis tasks for .sqlproj file with correct properties', async function (): Promise<void> {
+	it('Should create build and buildWithCodeAnalysis tasks for .sqlproj file with correct properties for SDK style project', async function (): Promise<void> {
 		// Define mock .sqlproj file URIs for testing
 		stubWorkspaceAndFiles([sqlProjUris[0]]);
 
+		// Stub the project as SDK style
+		stubProjectOpenWithStyle(vscodeMssql.ProjectType.SdkStyle);
+
 		// Act: create tasks using the provider
 		const tasks = await taskProvider.createTasks();
 
@@ -93,13 +110,23 @@ describe('Sql Database Projects Task Provider', function (): void {
 			should(buildTask.execution.args).not.be.undefined();
 			should(buildTask.execution.args).be.Array();
 			should(buildTask.execution.args[0]).equal('build');
+
+			const argsString = buildTask.execution.args.join(' ');
+			should(argsString).containEql('/p:NetCoreBuild=true');
+			should(argsString).containEql('/p:SystemDacpacsLocation=');
+			should(argsString).not.containEql('/p:NETCoreTargetsPath='); // This should NOT be present for SDK projects
+			should(argsString).containEql('-v:detailed');
+
 		}
 	});
 
 	it('Should not create any tasks when no .sqlproj files are present in the workspace', async function (): Promise<void> {
 		// Define mock .sqlproj file URIs for testing
 		stubWorkspaceAndFiles([]);
 
+		// Stub the project as SDK style
+		stubProjectOpenWithStyle(vscodeMssql.ProjectType.SdkStyle);
+
 		// Act: Attempt to create tasks using the provider
 		const tasks = await taskProvider.createTasks();
 
@@ -112,6 +139,9 @@ describe('Sql Database Projects Task Provider', function (): void {
 		// Define mock .sqlproj file URIs for testing
 		stubWorkspaceAndFiles(sqlProjUris);
 
+		// Stub the project as SDK style
+		stubProjectOpenWithStyle(vscodeMssql.ProjectType.SdkStyle);
+
 		// Act: create tasks using the provider
 		const tasks = await taskProvider.createTasks();
 
@@ -160,4 +190,43 @@ describe('Sql Database Projects Task Provider', function (): void {
 			}
 		}
 	});
+
+	it('Should create tasks with correct build arguments for legacy-style project', async function (): Promise<void> {
+		// Define mock .sqlproj file URIs for testing
+		stubWorkspaceAndFiles([sqlProjUris[0]]);
+
+		// Stub the project as SDK style
+		stubProjectOpenWithStyle(vscodeMssql.ProjectType.LegacyStyle);
+
+		// Act: create tasks using the provider
+		const tasks = await taskProvider.createTasks();
+
+		// Assert: tasks should be defined and have the expected length
+		should(tasks).not.be.undefined();
+		should(tasks).be.Array().and.have.length(2);
+
+		// Find the build task
+		const buildTask = tasks.find(t => t.name === 'ProjectA.sqlproj - Build');
+
+		// Assert: build task should exist
+		should(buildTask).not.be.undefined();
+
+		// Assert: build task execution should contain legacy-style arguments
+		should(buildTask?.execution).not.be.undefined();
+		if (buildTask?.execution instanceof vscode.ShellExecution) {
+			should(buildTask.execution.command).equal('dotnet');
+			should(buildTask.execution.args).not.be.undefined();
+			should(buildTask.execution.args).be.Array();
+
+			// Verify it contains build command
+			should(buildTask.execution.args[0]).equal('build');
+
+			// Verify it contains legacy-style build arguments
+			const argsString = buildTask.execution.args.join(' ');
+			should(argsString).containEql('/p:NetCoreBuild=true');
+			should(argsString).containEql('/p:SystemDacpacsLocation=');
+			should(argsString).containEql('/p:NETCoreTargetsPath='); // This is only for legacy projects
+			should(argsString).containEql('-v:detailed');
+		}
+	});
 });