JacksonBruce/HtmlSanitizer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update appveyor.yml

Browse Source
This commit is contained in:
Michael Ganss
2019-05-15 14:13:57 +02:00
parent 945f2ae2a1
commit a20cf1ad83
4 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
appveyor.yml
View File

@@ -1,4 +1,4 @@
version: 4.0.{build}
version: 5.0.{build}
skip_tags: true
image: Visual Studio 2017
environment:
@@ -9,14 +9,13 @@ environment:
nuget:
disable_publish_on_pr: true
build_script:
- ps: (Get-Content src\HtmlSanitizer\HtmlSanitizer.csproj).Replace("1.0.0-VERSION", $env:APPVEYOR_BUILD_VERSION) | Set-Content src\HtmlSanitizer\HtmlSanitizer.csproj
- dotnet restore
- dotnet pack --include-symbols --include-source -c Release src\HtmlSanitizer
test_script:
- ps: |
if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
dotnet tool install --global dotnet-sonarscanner
dotnet sonarscanner begin /k:"mganss_HtmlSanitizer" /v:$env:APPVEYOR_BUILD_VERSION /d:sonar.organization="mganss-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env:sonar_token" /d:sonar.cs.opencover.reportsPaths="$($env:APPVEYOR_BUILD_FOLDER)\coverage.xml" /d:sonar.coverage.exclusions="**/Program.cs"
dotnet sonarscanner begin /k:"mganss_HtmlSanitizer" /v:$env:APPVEYOR_BUILD_VERSION /o:"mganss-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$env:sonar_token" /d:sonar.cs.opencover.reportsPaths="$($env:APPVEYOR_BUILD_FOLDER)\coverage.xml" /d:sonar.coverage.exclusions="**/Program.cs"
dotnet build
}
- dotnet test /p:CollectCoverage=true /p:CoverletOutputFormat=opencover /p:CoverletOutput="..\..\coverage.xml" test\HtmlSanitizer.Tests\HtmlSanitizer.Tests.csproj -f netcoreapp2.0
@@ -24,7 +23,6 @@ test_script:
if (-not $env:APPVEYOR_PULL_REQUEST_NUMBER) {
dotnet sonarscanner end /d:sonar.login="$env:sonar_token"
}
- "SET PATH=C:\\Python34;C:\\Python34\\Scripts;%PATH%"
- pip install codecov
- codecov -f "coverage.xml"
artifacts:

13
src/HtmlSanitizer/HtmlSanitizer.csproj
View File

@@ -2,9 +2,12 @@
<PropertyGroup>
<Description>Cleans HTML from constructs that can be used for cross site scripting (XSS)</Description>
<Copyright>Copyright 2013-2018 Michael Ganss</Copyright>
<Copyright>Copyright 2013-$([System.DateTime]::Now.Year) Michael Ganss</Copyright>
<AssemblyTitle>HtmlSanitizer</AssemblyTitle>
<VersionPrefix>1.0.0-VERSION</VersionPrefix>
<AppVeyor_Build_Version Condition="'$(APPVEYOR_BUILD_VERSION)' == ''">1.0.0</AppVeyor_Build_Version>
<AssemblyVersion>5.0.0.0</AssemblyVersion>
<FileVersion>$(AppVeyor_Build_Version).0</FileVersion>
<PackageVersion>$(AppVeyor_Build_Version)-beta</PackageVersion>
<Authors>Michael Ganss</Authors>
<TargetFrameworks>net46;netstandard2.0</TargetFrameworks>
<AssemblyName>HtmlSanitizer</AssemblyName>
@@ -14,13 +17,15 @@
<PackageId>HtmlSanitizer</PackageId>
<PackageTags>xss;anti;antixss;html;security</PackageTags>
<PackageProjectUrl>https://github.com/mganss/HtmlSanitizer</PackageProjectUrl>
<PackageLicenseUrl>https://raw.github.com/mganss/HtmlSanitizer/master/LICENSE.md</PackageLicenseUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>git://github.com/mganss/HtmlSanitizer</RepositoryUrl>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<RootNamespace>Ganss.XSS</RootNamespace>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\HtmlSanitizer.xml</DocumentationFile>
<PublishRepositoryUrl>true</PublishRepositoryUrl>
<EmbedUntrackedSources>true</EmbedUntrackedSources>
<IncludeSymbols>true</IncludeSymbols>
</PropertyGroup>
<ItemGroup>

2
src/HtmlSanitizer/Properties/AssemblyInfo.cs
View File

@@ -12,5 +12,3 @@ using System.Runtime.InteropServices;
[assembly: Guid("16af04e9-e712-417e-b749-c8d10148dda9")]
#endif
[assembly: AssemblyVersion("3.0.0.0")]

6
test/HtmlSanitizer.Tests/Tests.cs
View File

@@ -2430,8 +2430,10 @@ rl(javascript:alert(""foo""))'>";
var allowedStyles = new[] { "margin-top" };
RemoveReason? actual = null;
var s = new HtmlSanitizer(allowedTags: allowedTags, allowedAttributes: allowedAttributes, allowedCssProperties: allowedStyles);
s.DisallowCssPropertyValue = new Regex(@"\d+.*");
var s = new HtmlSanitizer(allowedTags: allowedTags, allowedAttributes: allowedAttributes, allowedCssProperties: allowedStyles)
{
DisallowCssPropertyValue = new Regex(@"\d+.*")
};
s.RemovingStyle += (sender, args) =>
{
actual = args.Reason;