ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-16 09:35:36 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update xmldom to 0.8.2 (#19625)

Browse Source 
* Update xmldom to 0.8.2

* Fix test

* Comments
This commit is contained in:
Charles Gagnon
2022-06-06 12:59:09 -07:00
committed by GitHub
parent bbfd6617f9
commit f22c9a02ab
4 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/
import * as path from 'path';
import * as xmldom from 'xmldom';
import * as xmldom from '@xmldom/xmldom';
import * as constants from '../common/constants';
import * as utils from '../common/utils';
import * as xmlFormat from 'xml-formatter';
@@ -1583,12 +1583,15 @@ export class Project implements ISqlProject {
const suppressMissingDependenciesErrorNode = currentNode.getElementsByTagName(constants.SuppressMissingDependenciesErrors);
const suppressMissingDependences = suppressMissingDependenciesErrorNode[0].childNodes[0].nodeValue === constants.True;
// remove this node
this.projFileXmlDoc!.documentElement.removeChild(currentNode);
// delete ItemGroup if there aren't any other children
if (this.projFileXmlDoc!.documentElement.getElementsByTagName(constants.ArtifactReference).length === 0) {
// TODO Two issues here :
// 1. If there are multiple ItemGroups with ArtifactReference items then we won't clean up until all items are removed
// 2. If the ItemGroup has other non-ArtifactReference items in it then those will be deleted
// Right now we assume that this ItemGroup is not manually edited so it's safe to ignore these
if (this.projFileXmlDoc!.documentElement.getElementsByTagName(constants.ArtifactReference).length === 1) {
// delete entire ItemGroup if there aren't any other children
this.projFileXmlDoc!.documentElement.removeChild(currentNode.parentNode!);
} else {
this.projFileXmlDoc!.documentElement.removeChild(currentNode);
}
// remove from database references because it'll get added again later

2
extensions/sql-database-projects/src/models/publishProfile/publishProfile.ts
View File

@@ -3,7 +3,7 @@
* Licensed under the Source EULA. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
import * as xmldom from 'xmldom';
import * as xmldom from '@xmldom/xmldom';
import * as constants from '../../common/constants';
import * as utils from '../../common/utils';
import * as mssql from 'mssql';