diff --git a/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml b/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml
index d1e8ed2b3f..6b8dc0d1ee 100644
--- a/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml
+++ b/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml
@@ -61,7 +61,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/common/constants.ts b/extensions/sql-database-projects/src/common/constants.ts
index 1b1d86bcd9..42597759f7 100644
--- a/extensions/sql-database-projects/src/common/constants.ts
+++ b/extensions/sql-database-projects/src/common/constants.ts
@@ -221,7 +221,7 @@ export const Project = 'Project';
export const Condition = 'Condition';
export const Target = 'Target';
export const Name = 'Name';
-export const AfterCleanTarget = 'AfterClean';
+export const BeforeBuildTarget = 'BeforeBuild';
export const Delete = 'Delete';
export const Files = 'Files';
export const PackageReference = 'PackageReference';
diff --git a/extensions/sql-database-projects/src/models/project.ts b/extensions/sql-database-projects/src/models/project.ts
index 47354ad741..36ea952152 100644
--- a/extensions/sql-database-projects/src/models/project.ts
+++ b/extensions/sql-database-projects/src/models/project.ts
@@ -201,7 +201,7 @@ export class Project {
await fs.copyFile(this.projectFilePath, this.projectFilePath + '_backup');
await this.updateImportToSupportRoundTrip();
await this.updatePackageReferenceInProjFile();
- await this.updateAfterCleanTargetInProjFile();
+ await this.updateBeforeBuildTargetInProjFile();
await this.updateSystemDatabaseReferencesInProjFile();
}
} else if (this.containsSSDTOnlySystemDatabaseReferences()) {
@@ -232,21 +232,21 @@ export class Project {
await this.updateImportedTargetsToProjFile(constants.NetCoreCondition, constants.NetCoreTargets, undefined);
}
- private async updateAfterCleanTargetInProjFile(): Promise {
+ private async updateBeforeBuildTargetInProjFile(): Promise {
// Search if clean target already present, update it
for (let i = 0; i < this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target).length; i++) {
- const afterCleanNode = this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target)[i];
- const name = afterCleanNode.getAttribute(constants.Name);
- if (name === constants.AfterCleanTarget) {
- return await this.createCleanFileNode(afterCleanNode);
+ const beforeBuildNode = this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target)[i];
+ const name = beforeBuildNode.getAttribute(constants.Name);
+ if (name === constants.BeforeBuildTarget) {
+ return await this.createCleanFileNode(beforeBuildNode);
}
}
// If clean target not found, create new
- const afterCleanNode = this.projFileXmlDoc.createElement(constants.Target);
- afterCleanNode.setAttribute(constants.Name, constants.AfterCleanTarget);
- this.projFileXmlDoc.documentElement.appendChild(afterCleanNode);
- await this.createCleanFileNode(afterCleanNode);
+ const beforeBuildNode = this.projFileXmlDoc.createElement(constants.Target);
+ beforeBuildNode.setAttribute(constants.Name, constants.BeforeBuildTarget);
+ this.projFileXmlDoc.documentElement.appendChild(beforeBuildNode);
+ await this.createCleanFileNode(beforeBuildNode);
}
private async createCleanFileNode(parentNode: any): Promise {
diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml
index b9d21f990d..cd39077a60 100644
--- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml
@@ -73,7 +73,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTarget.xml
similarity index 99%
rename from extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml
rename to extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTarget.xml
index ad217bd0d0..e449868a91 100644
--- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml
+++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTarget.xml
@@ -54,7 +54,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate.xml
similarity index 99%
rename from extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml
rename to extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate.xml
index 0b9a0d6019..39dc2df6ad 100644
--- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml
+++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate.xml
@@ -54,7 +54,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml
index 5d0948d137..1ec9394229 100644
--- a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml
@@ -73,7 +73,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml
index b4ec269301..c7e8411099 100644
--- a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml
@@ -73,7 +73,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/baselines.ts b/extensions/sql-database-projects/src/test/baselines/baselines.ts
index 77c73c24c4..f60ed300f1 100644
--- a/extensions/sql-database-projects/src/test/baselines/baselines.ts
+++ b/extensions/sql-database-projects/src/test/baselines/baselines.ts
@@ -15,8 +15,8 @@ export let SSDTProjectFileBaseline: string;
export let SSDTProjectAfterUpdateBaseline: string;
export let SSDTUpdatedProjectBaseline: string;
export let SSDTUpdatedProjectAfterSystemDbUpdateBaseline: string;
-export let SSDTProjectBaselineWithCleanTarget: string;
-export let SSDTProjectBaselineWithCleanTargetAfterUpdate: string;
+export let SSDTProjectBaselineWithBeforeBuildTarget: string;
+export let SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate: string;
export let publishProfileIntegratedSecurityBaseline: string;
export let publishProfileSqlLoginBaseline: string;
export let openProjectWithProjectReferencesBaseline: string;
@@ -34,8 +34,8 @@ export async function loadBaselines() {
SSDTProjectAfterUpdateBaseline = await loadBaseline(baselineFolderPath, 'SSDTProjectAfterUpdateBaseline.xml');
SSDTUpdatedProjectBaseline = await loadBaseline(baselineFolderPath, 'SSDTUpdatedProjectBaseline.xml');
SSDTUpdatedProjectAfterSystemDbUpdateBaseline = await loadBaseline(baselineFolderPath, 'SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml');
- SSDTProjectBaselineWithCleanTarget = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithCleanTarget.xml');
- SSDTProjectBaselineWithCleanTargetAfterUpdate = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithCleanTargetAfterUpdate.xml');
+ SSDTProjectBaselineWithBeforeBuildTarget = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithBeforeBuildTarget.xml');
+ SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate.xml');
publishProfileIntegratedSecurityBaseline = await loadBaseline(baselineFolderPath, 'publishProfileIntegratedSecurityBaseline.publish.xml');
publishProfileSqlLoginBaseline = await loadBaseline(baselineFolderPath, 'publishProfileSqlLoginBaseline.publish.xml');
openProjectWithProjectReferencesBaseline = await loadBaseline(baselineFolderPath, 'openSqlProjectWithProjectReferenceBaseline.xml');
diff --git a/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml
index 4d1184b89e..b6209dc440 100644
--- a/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml
@@ -61,7 +61,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml
index 936ac85a1e..672ac872a0 100644
--- a/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml
@@ -61,7 +61,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml
index 463e70c0a7..e31261fc21 100644
--- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml
@@ -105,7 +105,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml
index e6c341211a..b4e1e52f83 100644
--- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml
@@ -109,7 +109,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml
index 4fd2441afe..c0e177c0c5 100644
--- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml
+++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml
@@ -102,7 +102,7 @@
-
+
diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml
index 9ae8cde495..2ab7d4e2c6 100644
--- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml
+++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml
@@ -103,7 +103,7 @@
TestProjectName
-
+
diff --git a/extensions/sql-database-projects/src/test/project.test.ts b/extensions/sql-database-projects/src/test/project.test.ts
index 077eb848c0..a6fea27fbb 100644
--- a/extensions/sql-database-projects/src/test/project.test.ts
+++ b/extensions/sql-database-projects/src/test/project.test.ts
@@ -590,7 +590,7 @@ describe('Project: round trip updates', function (): void {
});
it('Should update SSDT project to work in ADS handling pre-exsiting targets', async function (): Promise {
- await testUpdateInRoundTrip(baselines.SSDTProjectBaselineWithCleanTarget, baselines.SSDTProjectBaselineWithCleanTargetAfterUpdate);
+ await testUpdateInRoundTrip(baselines.SSDTProjectBaselineWithBeforeBuildTarget, baselines.SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate);
});
it('Should not update project and no backup file should be created when update to project is rejected', async function (): Promise {