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

Fix potential XML namespace bug #2979

Merged
merged 6 commits into from Sep 18, 2019
Merged

Fix potential XML namespace bug #2979

merged 6 commits into from Sep 18, 2019

Conversation

@bdukes
Copy link
Contributor

bdukes commented Sep 6, 2019

The background for this issue is documented in #2971. This PR fixes a bug that can be introduced when using collision="save" with an incorrectly created XML Merge file. This can result in an element with a namespace being replaced by an element that has the namespace reset (e.g. <dependentAssembly xmlns="">), resulting in that element being ignored.

bdukes added 3 commits Sep 6, 2019
For #2971
For #2971
dependentAssembly elements will be imported into the web.config, and
need to have the correct namespace there

For #2971
@bdukes bdukes changed the base branch from development to release/9.4.x Sep 6, 2019
Copy link
Contributor

mitchelsellers left a comment

lgtm

@valadas

This comment has been minimized.

Copy link
Contributor

valadas commented Sep 10, 2019

Since this is not regression, I have assigned it to 9.4.1, let me know if you want to to it differently...

@valadas valadas added the Type: Bug label Sep 10, 2019
@valadas valadas added this to the 9.4.1 milestone Sep 10, 2019
Copy link
Contributor

valadas left a comment

Looks good to me

mitchelsellers and others added 3 commits Sep 12, 2019
@valadas valadas merged commit 0b7c82b into release/9.4.x Sep 18, 2019
2 checks passed
2 checks passed
Dnn.Platform [CI] Build #9.4.1-pr2979.16.21503 succeeded
Details
license/cla All CLA requirements met.
Details
@iJungleboy

This comment has been minimized.

Copy link
Contributor

iJungleboy commented Sep 18, 2019

Very cool, awesome & thanks!

@valadas valadas deleted the bug/xmlns branch Dec 31, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.