ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

change afterClean to beforeBuild for removing the generated assests.json (#13736)

Browse Source 
* change afterClean to beforeBuild for removing the generated assests.json

* fix merge conflict

* rename files
This commit is contained in:
Kim Santiago
2020-12-11 11:54:35 -08:00
committed by GitHub
parent d2a525bbbe
commit 496fe0afa5
16 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml
View File

@@ -61,7 +61,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="Properties" /> <Folder Include="Properties" />
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target> </Target>
</Project> </Project>

2
extensions/sql-database-projects/src/common/constants.ts
View File

@@ -221,7 +221,7 @@ export const Project = 'Project';
export const Condition = 'Condition'; export const Condition = 'Condition';
export const Target = 'Target'; export const Target = 'Target';
export const Name = 'Name'; export const Name = 'Name';
export const AfterCleanTarget = 'AfterClean'; export const BeforeBuildTarget = 'BeforeBuild';
export const Delete = 'Delete'; export const Delete = 'Delete';
export const Files = 'Files'; export const Files = 'Files';
export const PackageReference = 'PackageReference'; export const PackageReference = 'PackageReference';

20
extensions/sql-database-projects/src/models/project.ts
View File

@@ -201,7 +201,7 @@ export class Project {
await fs.copyFile(this.projectFilePath, this.projectFilePath + '_backup'); await fs.copyFile(this.projectFilePath, this.projectFilePath + '_backup');
await this.updateImportToSupportRoundTrip(); await this.updateImportToSupportRoundTrip();
await this.updatePackageReferenceInProjFile(); await this.updatePackageReferenceInProjFile();
await this.updateAfterCleanTargetInProjFile(); await this.updateBeforeBuildTargetInProjFile();
await this.updateSystemDatabaseReferencesInProjFile(); await this.updateSystemDatabaseReferencesInProjFile();
} }
} else if (this.containsSSDTOnlySystemDatabaseReferences()) { } else if (this.containsSSDTOnlySystemDatabaseReferences()) {
@@ -232,21 +232,21 @@ export class Project {
await this.updateImportedTargetsToProjFile(constants.NetCoreCondition, constants.NetCoreTargets, undefined); await this.updateImportedTargetsToProjFile(constants.NetCoreCondition, constants.NetCoreTargets, undefined);
} }
private async updateAfterCleanTargetInProjFile(): Promise<void> { private async updateBeforeBuildTargetInProjFile(): Promise<void> {
// Search if clean target already present, update it // Search if clean target already present, update it
for (let i = 0; i < this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target).length; i++) { for (let i = 0; i < this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target).length; i++) {
const afterCleanNode = this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target)[i]; const beforeBuildNode = this.projFileXmlDoc.documentElement.getElementsByTagName(constants.Target)[i];
const name = afterCleanNode.getAttribute(constants.Name); const name = beforeBuildNode.getAttribute(constants.Name);
if (name === constants.AfterCleanTarget) { if (name === constants.BeforeBuildTarget) {
return await this.createCleanFileNode(afterCleanNode); return await this.createCleanFileNode(beforeBuildNode);
} }
} }
// If clean target not found, create new // If clean target not found, create new
const afterCleanNode = this.projFileXmlDoc.createElement(constants.Target); const beforeBuildNode = this.projFileXmlDoc.createElement(constants.Target);
afterCleanNode.setAttribute(constants.Name, constants.AfterCleanTarget); beforeBuildNode.setAttribute(constants.Name, constants.BeforeBuildTarget);
this.projFileXmlDoc.documentElement.appendChild(afterCleanNode); this.projFileXmlDoc.documentElement.appendChild(beforeBuildNode);
await this.createCleanFileNode(afterCleanNode); await this.createCleanFileNode(beforeBuildNode);
} }
private async createCleanFileNode(parentNode: any): Promise<void> { private async createCleanFileNode(parentNode: any): Promise<void> {

2
extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml
View File

@@ -73,7 +73,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/> <PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/>
</Target> </Target>
<ItemGroup> <ItemGroup>

2
extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml → extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTarget.xml
View File

@@ -54,7 +54,7 @@
</PropertyGroup> </PropertyGroup>
<Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> <Import Condition="'$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" /> <Import Condition="'$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<!-- Custom logic added by user --> <!-- Custom logic added by user -->
</Target> </Target>
<ItemGroup> <ItemGroup>

2
extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml → extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate.xml
View File

@@ -54,7 +54,7 @@
</PropertyGroup> </PropertyGroup>
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets"/> <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets"/>
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets"/> <Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets"/>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<!-- Custom logic added by user --> <!-- Custom logic added by user -->
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/>
</Target> </Target>

2
extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml
View File

@@ -73,7 +73,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/> <PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/>
</Target> </Target>
<ItemGroup> <ItemGroup>

2
extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml
View File

@@ -73,7 +73,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/> <PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All"/>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/>
</Target> </Target>
<ItemGroup> <ItemGroup>

8
extensions/sql-database-projects/src/test/baselines/baselines.ts
View File

@@ -15,8 +15,8 @@ export let SSDTProjectFileBaseline: string;
export let SSDTProjectAfterUpdateBaseline: string; export let SSDTProjectAfterUpdateBaseline: string;
export let SSDTUpdatedProjectBaseline: string; export let SSDTUpdatedProjectBaseline: string;
export let SSDTUpdatedProjectAfterSystemDbUpdateBaseline: string; export let SSDTUpdatedProjectAfterSystemDbUpdateBaseline: string;
export let SSDTProjectBaselineWithCleanTarget: string; export let SSDTProjectBaselineWithBeforeBuildTarget: string;
export let SSDTProjectBaselineWithCleanTargetAfterUpdate: string; export let SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate: string;
export let publishProfileIntegratedSecurityBaseline: string; export let publishProfileIntegratedSecurityBaseline: string;
export let publishProfileSqlLoginBaseline: string; export let publishProfileSqlLoginBaseline: string;
export let openProjectWithProjectReferencesBaseline: string; export let openProjectWithProjectReferencesBaseline: string;
@@ -34,8 +34,8 @@ export async function loadBaselines() {
SSDTProjectAfterUpdateBaseline = await loadBaseline(baselineFolderPath, 'SSDTProjectAfterUpdateBaseline.xml'); SSDTProjectAfterUpdateBaseline = await loadBaseline(baselineFolderPath, 'SSDTProjectAfterUpdateBaseline.xml');
SSDTUpdatedProjectBaseline = await loadBaseline(baselineFolderPath, 'SSDTUpdatedProjectBaseline.xml'); SSDTUpdatedProjectBaseline = await loadBaseline(baselineFolderPath, 'SSDTUpdatedProjectBaseline.xml');
SSDTUpdatedProjectAfterSystemDbUpdateBaseline = await loadBaseline(baselineFolderPath, 'SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml'); SSDTUpdatedProjectAfterSystemDbUpdateBaseline = await loadBaseline(baselineFolderPath, 'SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml');
SSDTProjectBaselineWithCleanTarget = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithCleanTarget.xml'); SSDTProjectBaselineWithBeforeBuildTarget = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithBeforeBuildTarget.xml');
SSDTProjectBaselineWithCleanTargetAfterUpdate = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithCleanTargetAfterUpdate.xml'); SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate = await loadBaseline(baselineFolderPath, 'SSDTProjectBaselineWithBeforeBuildTargetAfterUpdate.xml');
publishProfileIntegratedSecurityBaseline = await loadBaseline(baselineFolderPath, 'publishProfileIntegratedSecurityBaseline.publish.xml'); publishProfileIntegratedSecurityBaseline = await loadBaseline(baselineFolderPath, 'publishProfileIntegratedSecurityBaseline.publish.xml');
publishProfileSqlLoginBaseline = await loadBaseline(baselineFolderPath, 'publishProfileSqlLoginBaseline.publish.xml'); publishProfileSqlLoginBaseline = await loadBaseline(baselineFolderPath, 'publishProfileSqlLoginBaseline.publish.xml');
openProjectWithProjectReferencesBaseline = await loadBaseline(baselineFolderPath, 'openSqlProjectWithProjectReferenceBaseline.xml'); openProjectWithProjectReferencesBaseline = await loadBaseline(baselineFolderPath, 'openSqlProjectWithProjectReferenceBaseline.xml');

2
extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml
View File

@@ -61,7 +61,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="Properties" /> <Folder Include="Properties" />
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target> </Target>
</Project> </Project>

2
extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml
View File

@@ -61,7 +61,7 @@
<ItemGroup> <ItemGroup>
<Folder Include="Properties" /> <Folder Include="Properties" />
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target> </Target>
<ItemGroup> <ItemGroup>

2
extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml
View File

@@ -105,7 +105,7 @@
<PostDeploy Include="Script.PostDeployment1.sql"/> <PostDeploy Include="Script.PostDeployment1.sql"/>
<None Include="Tables\Script.PostDeployment1.sql"/> <None Include="Tables\Script.PostDeployment1.sql"/>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target> </Target>
</Project> </Project>

2
extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml
View File

@@ -109,7 +109,7 @@
<PostDeploy Include="Script.PostDeployment1.sql"/> <PostDeploy Include="Script.PostDeployment1.sql"/>
<None Include="Tables\Script.PostDeployment1.sql"/> <None Include="Tables\Script.PostDeployment1.sql"/>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json"/>
</Target> </Target>
</Project> </Project>

2
extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml
View File

@@ -102,7 +102,7 @@
<PostDeploy Include="Script.PostDeployment1.sql"/> <PostDeploy Include="Script.PostDeployment1.sql"/>
<None Include="Tables\Script.PostDeployment1.sql"/> <None Include="Tables\Script.PostDeployment1.sql"/>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target> </Target>
</Project> </Project>

2
extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml
View File

@@ -103,7 +103,7 @@
<DatabaseSqlCmdVariable>TestProjectName</DatabaseSqlCmdVariable> <DatabaseSqlCmdVariable>TestProjectName</DatabaseSqlCmdVariable>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Target Name="AfterClean"> <Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" /> <Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target> </Target>
</Project> </Project>

2
extensions/sql-database-projects/src/test/project.test.ts
View File

@@ -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<void> { it('Should update SSDT project to work in ADS handling pre-exsiting targets', async function (): Promise<void> {
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<void> { it('Should not update project and no backup file should be created when update to project is rejected', async function (): Promise<void> {