Skip to content

Commit

Permalink
#324: Removed image urls for HTML inline reports
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielpalme
danielpalme committed Mar 8, 2020
2 parents cd46eef + f60dddf commit ad8156f
Show file tree
Hide file tree
Showing 15 changed files with 44 additions and 23 deletions.
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Expand Up @@ -11,7 +11,7 @@ variables:
buildPlatform: 'Any CPU'
buildConfiguration: 'Release'
disable.coverage.autogenerate: 'true'
version: '4.5.0'
version: '4.5.1'

# Prepare
steps:
Expand Down
Binary file modified docs/resources/SampleReports.zip
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/AzureDevopsTask/ReportGenerator/task.json
View file
Expand Up @@ -13,7 +13,7 @@
"version": {
"Major": 4,
"Minor": 5,
"Patch": 0
"Patch": 1
},
"instanceNameFormat": "ReportGenerator",
"groups": [
Expand Down
2 changes: 1 addition & 1 deletion src/AzureDevopsTask/vss-extension.json
View file
Expand Up @@ -2,7 +2,7 @@
"manifestVersion": 1,
"id": "reportgenerator",
"name": "ReportGenerator",
"version": "4.5.0",
"version": "4.5.1",
"publisher": "Palmmedia",
"public": true,
"targets": [
Expand Down
4 changes: 4 additions & 0 deletions src/Readme.txt
View file
Expand Up @@ -63,6 +63,10 @@ For further details take a look at LICENSE.txt.

CHANGELOG

4.5.1.0

* New: Issue #324: Removed image urls for HTML inline reports

4.5.0.0

* New: Issue #323: Added new output format Clover
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.Console.NetCore/ReportGenerator.Console.NetCore.csproj
View file
Expand Up @@ -7,8 +7,8 @@
<AssemblyName>ReportGenerator</AssemblyName>
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
<StartupObject>Palmmedia.ReportGenerator.Console.NetCore.Program</StartupObject>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.Console/Properties/AssemblyInfo.cs
View file
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("4.5.0.0")]
[assembly: AssemblyFileVersion("4.5.0.0")]
[assembly: AssemblyVersion("4.5.1.0")]
[assembly: AssemblyFileVersion("4.5.1.0")]
4 changes: 2 additions & 2 deletions src/ReportGenerator.Core.Test/ReportGenerator.Core.Test.csproj
View file
Expand Up @@ -4,8 +4,8 @@
<TargetFramework>netcoreapp2.0</TargetFramework>
<IsPackable>false</IsPackable>
<RootNamespace>Palmmedia.ReportGenerator.Core.Test</RootNamespace>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.Core/ReportGenerator.Core.csproj
View file
Expand Up @@ -7,8 +7,8 @@
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AssemblyName>ReportGenerator.Core</AssemblyName>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
23 changes: 20 additions & 3 deletions src/ReportGenerator.Core/Reporting/Builders/Rendering/HtmlRenderer.cs
View file
Expand Up @@ -1344,14 +1344,31 @@ private void SaveJavaScript(string targetDirectory)
private Stream GetCombinedCss()
{
var ms = new MemoryStream();
var lineBreak = Encoding.UTF8.GetBytes(Environment.NewLine);

void CopyWithFilteredUrls(Stream s)
{
if (!this.inlineCssAndJavaScript)
{
s.CopyTo(ms);
return;
}

using (var reader = new StreamReader(s))
{
var contents = Regex.Replace(reader.ReadToEnd(), @"url\(icon_.+.svg\),\s", string.Empty);
var bytes = Encoding.UTF8.GetBytes(contents);
ms.Write(bytes, 0, bytes.Length);
ms.Write(lineBreak, 0, lineBreak.Length);
}
}

using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream(
$"Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.{this.cssFileResource}"))
{
stream.CopyTo(ms);
CopyWithFilteredUrls(stream);
}

byte[] lineBreak = Encoding.UTF8.GetBytes(Environment.NewLine);
ms.Write(lineBreak, 0, lineBreak.Length);
ms.Write(lineBreak, 0, lineBreak.Length);

Expand All @@ -1363,7 +1380,7 @@ private Stream GetCombinedCss()
using (Stream stream = typeof(HtmlRenderer).Assembly.GetManifestResourceStream(
$"Palmmedia.ReportGenerator.Core.Reporting.Builders.Rendering.resources.{this.additionalCssFileResource}"))
{
stream.CopyTo(ms);
CopyWithFilteredUrls(stream);
}

ms.Write(lineBreak, 0, lineBreak.Length);
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.DotnetCliTool/ReportGenerator.DotnetCliTool.csproj
View file
Expand Up @@ -7,8 +7,8 @@
<AssemblyName>dotnet-reportgenerator</AssemblyName>
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
<StartupObject>Palmmedia.ReportGenerator.DotnetCliTool.Program</StartupObject>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.DotnetCorePluginLoader/ReportGenerator.DotnetCorePluginLoader.csproj
View file
Expand Up @@ -2,8 +2,8 @@
<PropertyGroup>
<TargetFramework>netcoreapp2.0</TargetFramework>
<RootNamespace>ReportGenerator.DotnetCorePluginLoader</RootNamespace>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.DotnetGlobalTool/ReportGenerator.DotnetGlobalTool.csproj
View file
Expand Up @@ -7,8 +7,8 @@
<AssemblyName>ReportGenerator</AssemblyName>
<RootNamespace>Palmmedia.ReportGenerator</RootNamespace>
<StartupObject>Palmmedia.ReportGenerator.DotnetGlobalTool.Program</StartupObject>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ReportGenerator.MSBuild/ReportGenerator.MSBuild.csproj
View file
Expand Up @@ -5,8 +5,8 @@
<RootNamespace>Palmmedia.ReportGenerator.MSBuild</RootNamespace>
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
<AssemblyVersion>4.5.0.0</AssemblyVersion>
<FileVersion>4.5.0.0</FileVersion>
<AssemblyVersion>4.5.1.0</AssemblyVersion>
<FileVersion>4.5.1.0</FileVersion>
</PropertyGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/build.proj
View file
Expand Up @@ -22,7 +22,7 @@

<!-- Version, adjust before build -->
<PropertyGroup>
<Version>4.5.0</Version>
<Version>4.5.1</Version>
</PropertyGroup>

<!-- Tools -->
Expand Down

0 comments on commit ad8156f

Please sign in to comment.