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

Fixes #9615 - Upgrade to Htmlsanitizer v5 #9856

Merged
merged 4 commits into from
Feb 22, 2021

Conversation

nzdev
Copy link
Contributor

@nzdev nzdev commented Feb 20, 2021

Prerequisites

  • I have added steps to test this contribution in the description below

If there's an existing issue for this PR then this fixes

Description

Restores HtmlSanitizer v5. Builds. Also some small optimisations for building the icon lists. IHtmlSanitizer injected via constructor and registered in a composer, allowing for customization.
Reverts
#9803 @nul800sebastiaan

Fixes #9615

@@ -1293,7 +1296,7 @@
</PropertyGroup>
<ItemGroup>
<!-- we want to exclude all facade references ?! -->
<FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http'" />
<FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http' and '%(ReferencePath.FileName)' != 'System.Text.Encoding.CodePages'" />
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was the build fix

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting.. I am not sure what the problem we're trying to solve with FixedReferencePath is but.. if it works, it works 🤷

@nzdev nzdev changed the title Restore Htmlsanitizer as v5 Restore Htmlsanitizer, @v5 Feb 20, 2021
src/Umbraco.Web/Services/IconService.cs Outdated Show resolved Hide resolved
@@ -1293,7 +1296,7 @@
</PropertyGroup>
<ItemGroup>
<!-- we want to exclude all facade references ?! -->
<FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http'" />
<FixedReferencePath Include="@(ReferencePath)" Condition="'%(ReferencePath.FileName)' != 'System.ValueTuple' and '%(ReferencePath.FileName)' != 'System.Net.Http' and '%(ReferencePath.FileName)' != 'System.Text.Encoding.CodePages'" />
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Interesting.. I am not sure what the problem we're trying to solve with FixedReferencePath is but.. if it works, it works 🤷

@nul800sebastiaan nul800sebastiaan changed the title Restore Htmlsanitizer, @v5 Upgrade to Htmlsanitizer v5 Feb 22, 2021
@nul800sebastiaan nul800sebastiaan changed the title Upgrade to Htmlsanitizer v5 Fixes #9615 - Upgrade to Htmlsanitizer v5 Feb 22, 2021
@nul800sebastiaan nul800sebastiaan merged commit a6e1c2e into umbraco:v8/contrib Feb 22, 2021
nul800sebastiaan pushed a commit that referenced this pull request Feb 22, 2021
@nul800sebastiaan nul800sebastiaan added status/dependency-update This change requires a dependency to be updated (Deploy, Forms, Courier) and removed dependencies Pull requests that update a dependency file labels Apr 6, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
community/pr release/8.12.0 status/dependency-update This change requires a dependency to be updated (Deploy, Forms, Courier) type/feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Update HtmlSanitizer
2 participants