Skip to content

Commit 49896de

Browse files
steseestesee
authored
Merge pull request #145 from Codeuctivity/main
Update WmlToHtmlConverter.cs to avoid null shadeType on shadings
2 parents b9aad09 + c81fc52 commit 49896de

172 files changed

Lines changed: 196 additions & 147 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/dotnet.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
- name: Build
2525
run: dotnet build --configuration Release --no-restore
2626
- name: Test
27-
run: dotnet test --no-build --verbosity normal --configuration Release
27+
run: dotnet test --no-build --verbosity normal --configuration Release --logger "trx;LogFileName=${{ runner.workspace }}/OpenXmlPowerTools/TestResult/test_results.trx"
2828
- name: Publish Unit Test Results
2929
uses: actions/upload-artifact@v4
3030
if: failure()

‎OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/AllowedDiffInfo.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
namespace Codeuctivity.Tests.OpenXMLWordProcessingMLToHtmlConverter
2+
{
3+
internal class AllowedDiffInfo
4+
{
5+
public bool DiffFileExists;
6+
public string NewDiffImageFileName;
7+
public string[] ExistingDiffImageFilename;
8+
9+
public AllowedDiffInfo(bool diffFileExists, string newDiffImageFileName, string[] matchingFiles)
10+
{
11+
DiffFileExists = diffFileExists;
12+
NewDiffImageFileName = newDiffImageFileName;
13+
ExistingDiffImageFilename = matchingFiles;
14+
}
15+
}
16+
}

‎OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterHandlerTests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using Codeuctivity.OpenXmlPowerTools;
22
using Codeuctivity.OpenXmlPowerTools.OpenXMLWordprocessingMLToHtmlConverter;
3+
using Codeuctivity.SkiaSharpCompare;
34
using System;
45
using System.Collections.Generic;
56
using System.IO;
@@ -58,7 +59,7 @@ public void ShouldTranslateWithDefaultImageHandler(string imageType, string mini
5859
expectedImage.Position = 0;
5960
actualImage.Position = 0;
6061

61-
Assert.True(ImageSharpCompare.ImageSharpCompare.ImagesAreEqual(expectedImage, actualImage));
62+
Assert.True(Compare.ImagesAreEqual(expectedImage, actualImage, transparencyOptions: TransparencyOptions.CompareAlphaChannel));
6263
}
6364

6465
[Fact]

‎OpenXmlPowerTools.Tests/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverterTests.cs‎

Lines changed: 85 additions & 53 deletions
Large diffs are not rendered by default.

‎OpenXmlPowerTools.Tests/OpenXmlPowerTools.Tests.csproj‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,30 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
3-
<PropertyGroup>
4-
<LangVersion>8.0</LangVersion>
5-
<TargetFrameworks>net8.0</TargetFrameworks>
6-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
7-
</PropertyGroup>
8-
<ItemGroup>
9-
<PackageReference Include="Codeuctivity.HtmlRenderer" Version="2.2.225" />
10-
<PackageReference Include="Codeuctivity.ImageSharpCompare" Version="2.0.173" />
11-
<PackageReference Include="coverlet.collector" Version="6.0.0">
12-
<PrivateAssets>all</PrivateAssets>
13-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14-
</PackageReference>
15-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
16-
<PackageReference Include="xunit" Version="2.5.0" />
17-
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
18-
<PrivateAssets>all</PrivateAssets>
19-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20-
</PackageReference>
21-
<PackageReference Include="xunit.runner.console" Version="2.5.0">
22-
<PrivateAssets>all</PrivateAssets>
23-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24-
</PackageReference>
25-
</ItemGroup>
26-
27-
<ItemGroup>
28-
<ProjectReference Include="..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
29-
</ItemGroup>
30-
</Project>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
3+
<PropertyGroup>
4+
<LangVersion>8.0</LangVersion>
5+
<TargetFrameworks>net8.0</TargetFrameworks>
6+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
7+
</PropertyGroup>
8+
<ItemGroup>
9+
<PackageReference Include="Codeuctivity.HtmlRenderer" Version="4.0.438" />
10+
<PackageReference Include="Codeuctivity.SkiaSharpCompare" Version="3.0.165-PreRelease" />
11+
<PackageReference Include="coverlet.collector" Version="6.0.0">
12+
<PrivateAssets>all</PrivateAssets>
13+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
14+
</PackageReference>
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.0" />
16+
<PackageReference Include="xunit" Version="2.9.3" />
17+
<PackageReference Include="xunit.runner.visualstudio" Version="3.0.2">
18+
<PrivateAssets>all</PrivateAssets>
19+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
20+
</PackageReference>
21+
<PackageReference Include="xunit.runner.console" Version="2.9.3">
22+
<PrivateAssets>all</PrivateAssets>
23+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
24+
</PackageReference>
25+
</ItemGroup>
26+
27+
<ItemGroup>
28+
<ProjectReference Include="..\OpenXmlPowerTools\OpenXmlPowerTools.csproj" />
29+
</ItemGroup>
30+
</Project>

‎OpenXmlPowerTools/OpenXMLWordprocessingMLToHtmlConverter/WmlToHtmlConverter.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3146,7 +3146,7 @@ private static void CreateStyleFromShd(Dictionary<string, string> style, XElemen
31463146
return;
31473147
}
31483148

3149-
var shadeType = (string)shd.Attribute(W.val);
3149+
var shadeType = (string)shd.Attribute(W.val) ?? "clear";
31503150
var color = (string)shd.Attribute(W.color);
31513151
var fill = (string)shd.Attribute(W.fill);
31523152
if (ShadeMapper.ContainsKey(shadeType))
@@ -3618,4 +3618,4 @@ private static bool ConvertTrueFalseValueToBool(string? trueFalseValue)
36183618
return returnValue;
36193619
}
36203620
}
3621-
}
3621+
}

‎OpenXmlPowerTools/OpenXmlPowerTools.csproj‎

Lines changed: 59 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
2-
<PropertyGroup>
3-
<TargetFrameworks>net8.0</TargetFrameworks>
4-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5-
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6-
<RepositoryUrl>https://github.com/Codeuctivity/OpenXmlPowerTools</RepositoryUrl>
7-
<PackageTags>OpenXML DOCX Word XLSX Excel PPTX Powerpoint</PackageTags>
8-
<Authors>Stefan Seeland</Authors>
9-
<Company>Codeuctivity</Company>
10-
<Version Condition="'$(CURRENT_VERSION)' != ''">$(CURRENT_VERSION)</Version>
11-
<Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
12-
<AssemblyVersion>$(Version)</AssemblyVersion>
13-
<FileVersion>$(Version)</FileVersion>
14-
<PackageVersion>$(Version)</PackageVersion>
15-
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
16-
<PackageIcon>NugetIcon.png</PackageIcon>
17-
<PackageProjectUrl>https://github.com/Codeuctivity/OpenXmlPowerTools</PackageProjectUrl>
18-
<Description>The Open XML SDK provides tools for working with Office Word, Excel, and PowerPoint documents. This fork supports current .net versions.</Description>
19-
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20-
<AssemblyOriginatorKeyFile>OpenXmlPowerTools.snk</AssemblyOriginatorKeyFile>
21-
<SignAssembly>true</SignAssembly>
22-
<IncludeSymbols>true</IncludeSymbols>
23-
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24-
<PublishRepositoryUrl>true</PublishRepositoryUrl>
25-
<EmbedUntrackedSources>true</EmbedUntrackedSources>
26-
<Nullable>enable</Nullable>
27-
<LangVersion>8.0</LangVersion>
28-
<RootNamespace>Codeuctivity.OpenXmlPowerTools</RootNamespace>
29-
<NeutralLanguage>en</NeutralLanguage>
30-
<EnableNETAnalyzers>true</EnableNETAnalyzers>
31-
<PackageId>Codeuctivity.OpenXmlPowerTools</PackageId>
32-
<AssemblyName>Codeuctivity.OpenXmlPowerTools</AssemblyName>
33-
<PackageReadmeFile>nugetReadme.md</PackageReadmeFile>
34-
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
35-
</PropertyGroup>
36-
<ItemGroup>
37-
<None Include="docs\nugetReadme.md" Pack="true" PackagePath="\" />
38-
</ItemGroup>
39-
<ItemGroup>
40-
<Compile Remove="Properties\**" />
41-
<EmbeddedResource Remove="Properties\**" />
42-
<None Remove="Properties\**" />
43-
</ItemGroup>
44-
<ItemGroup>
45-
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
46-
<PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
47-
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.9" />
48-
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.7.0.75501">
49-
<PrivateAssets>all</PrivateAssets>
50-
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
51-
</PackageReference>
52-
</ItemGroup>
53-
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
54-
<PackageReference Include="System.IO.Packaging" Version="9.0.1" />
55-
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
56-
</ItemGroup>
57-
<ItemGroup>
58-
<None Include="NugetIcon.png" Pack="true" PackagePath="\" />
59-
</ItemGroup>
1+
<Project Sdk="Microsoft.NET.Sdk">
2+
<PropertyGroup>
3+
<TargetFrameworks>net8.0</TargetFrameworks>
4+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
5+
<GenerateDocumentationFile>true</GenerateDocumentationFile>
6+
<RepositoryUrl>https://github.com/Codeuctivity/OpenXmlPowerTools</RepositoryUrl>
7+
<PackageTags>OpenXML DOCX Word XLSX Excel PPTX Powerpoint</PackageTags>
8+
<Authors>Stefan Seeland</Authors>
9+
<Company>Codeuctivity</Company>
10+
<Version Condition="'$(CURRENT_VERSION)' != ''">$(CURRENT_VERSION)</Version>
11+
<Version Condition="'$(CURRENT_VERSION)' == ''">0.0.1</Version>
12+
<AssemblyVersion>$(Version)</AssemblyVersion>
13+
<FileVersion>$(Version)</FileVersion>
14+
<PackageVersion>$(Version)</PackageVersion>
15+
<PackageReleaseNotes>$(LAST_COMMIT_MESSAGE)</PackageReleaseNotes>
16+
<PackageIcon>NugetIcon.png</PackageIcon>
17+
<PackageProjectUrl>https://github.com/Codeuctivity/OpenXmlPowerTools</PackageProjectUrl>
18+
<Description>The Open XML SDK provides tools for working with Office Word, Excel, and PowerPoint documents. This fork supports current .net versions.</Description>
19+
<PackageLicenseExpression>MIT</PackageLicenseExpression>
20+
<AssemblyOriginatorKeyFile>OpenXmlPowerTools.snk</AssemblyOriginatorKeyFile>
21+
<SignAssembly>true</SignAssembly>
22+
<IncludeSymbols>true</IncludeSymbols>
23+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
24+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
25+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
26+
<Nullable>enable</Nullable>
27+
<LangVersion>8.0</LangVersion>
28+
<RootNamespace>Codeuctivity.OpenXmlPowerTools</RootNamespace>
29+
<NeutralLanguage>en</NeutralLanguage>
30+
<EnableNETAnalyzers>true</EnableNETAnalyzers>
31+
<PackageId>Codeuctivity.OpenXmlPowerTools</PackageId>
32+
<AssemblyName>Codeuctivity.OpenXmlPowerTools</AssemblyName>
33+
<PackageReadmeFile>nugetReadme.md</PackageReadmeFile>
34+
<ContinuousIntegrationBuild Condition="'$(GITHUB_ACTIONS)' == 'true'">true</ContinuousIntegrationBuild>
35+
</PropertyGroup>
36+
<ItemGroup>
37+
<None Include="docs\nugetReadme.md" Pack="true" PackagePath="\" />
38+
</ItemGroup>
39+
<ItemGroup>
40+
<Compile Remove="Properties\**" />
41+
<EmbeddedResource Remove="Properties\**" />
42+
<None Remove="Properties\**" />
43+
</ItemGroup>
44+
<ItemGroup>
45+
<PackageReference Include="DocumentFormat.OpenXml" Version="3.0.2" />
46+
<PackageReference Include="SixLabors.Fonts" Version="1.0.1" />
47+
<PackageReference Include="SixLabors.ImageSharp" Version="2.1.10" />
48+
<PackageReference Include="SonarAnalyzer.CSharp" Version="10.7.0.110445">
49+
<PrivateAssets>all</PrivateAssets>
50+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
51+
</PackageReference>
52+
</ItemGroup>
53+
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
54+
<PackageReference Include="System.IO.Packaging" Version="9.0.1" />
55+
<PackageReference Include="System.IO.Compression" Version="4.3.0" />
56+
</ItemGroup>
57+
<ItemGroup>
58+
<None Include="NugetIcon.png" Pack="true" PackagePath="\" />
59+
</ItemGroup>
6060
</Project>

‎OpenXmlPowerToolsExamples/MarkupSimplifierApp/MarkupSimplifierApp.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.2" />
12+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="9.0.7" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎TestFiles/HC001-5DayTourPlanTemplate.docxExpectation.png‎

-2.73 KB

‎TestFiles/HC001-5DayTourPlanTemplate.docxExpectation.png.diff.win.png‎

42.7 KB

0 commit comments

Comments
 (0)