Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

bump xmldom to 0.6.0 to avoid bug where it keeps "<" in attributes (backport #1974) #1994

Merged
merged 2 commits into from Aug 4, 2021

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 4, 2021

This is an automatic backport of pull request #1974 done by Mergify.
Cherry-pick of 97a229f has failed:

On branch mergify/bp/release/2.19.x/pr-1974
Your branch is up to date with 'origin/release/2.19.x'.

You are currently cherry-picking commit 97a229ff45.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   clients/itwin/package.json
	new file:   common/changes/@bentley/ecschema-editing/bump-xmldom_2021-07-30-17-07.json
	new file:   common/changes/@bentley/ecschema-locaters/bump-xmldom_2021-07-30-17-07.json
	new file:   common/changes/@bentley/ecschema-metadata/bump-xmldom_2021-07-30-17-07.json
	new file:   common/changes/@bentley/ecschema2ts/bump-xmldom_2021-07-30-17-07.json
	new file:   common/changes/@bentley/itwin-client/bump-xmldom_2021-07-30-17-07.json
	modified:   core/ecschema-editing/package.json
	modified:   core/ecschema-locaters/package.json
	modified:   core/ecschema-metadata/package.json
	new file:   core/ecschema-metadata/src/test/Serialization/XmlSerializer.test.ts
	modified:   tools/ecschema2ts/package.json

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   common/config/rush/pnpm-lock.yaml

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.io/

…1974)

* bump xmldom to 0.6.0 to avoid bug where it keeps "<" in attributes
see xmldom/xmldom#198

* add test which fails on version of 0.5.0 because of bad serialization
* add valid entity serialization test
* move serialization test down to serializer package instead of up at transformer level
* better test name not referencing round trip

Co-authored-by: Michael Belousov <MichaelBelousov@users.noreply.github.com>
(cherry picked from commit 97a229f)

# Conflicts:
#	common/config/rush/pnpm-lock.yaml
@skirby1996 skirby1996 merged commit c88672c into release/2.19.x Aug 4, 2021
@skirby1996 skirby1996 deleted the mergify/bp/release/2.19.x/pr-1974 branch August 4, 2021 20:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants