Skip to content

Commit 4a0ec0e

Browse files
iText-CIiText-CI
committed
Merge branch 'release_branch_DEVSIX-5576' into master-rc
2 parents 5ffce0c + 2f335a2 commit 4a0ec0e

File tree

622 files changed

+4021
-2355
lines changed

Some content is hidden

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

622 files changed

+4021
-2355
lines changed

‎doxyfile

+4-7
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8
3232
# title of most generated pages and in a few other places.
3333
# The default value is: My Project.
3434

35-
PROJECT_NAME = "pdfHTML 3.0.5 API"
35+
PROJECT_NAME = "pdfHTML 4.0.0 API"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version
@@ -829,7 +829,7 @@ WARN_LOGFILE =
829829
# spaces. See also FILE_PATTERNS and EXTENSION_MAPPING
830830
# Note: If this tag is empty the current directory is searched.
831831

832-
INPUT =
832+
INPUT =
833833

834834
# This tag can be used to specify the character encoding of the source files
835835
# that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses
@@ -869,8 +869,7 @@ RECURSIVE = YES
869869
# Note that relative paths are relative to the directory from which doxygen is
870870
# run.
871871

872-
EXCLUDE = itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/BodyHtmlStylesContainer.cs /
873-
itext/itext.html2pdf/itext/html2pdf/Html2PdfProductInfo.cs
872+
EXCLUDE = itext/itext.html2pdf/itext/html2pdf/attach/impl/layout/BodyHtmlStylesContainer.cs
874873

875874
# The EXCLUDE_SYMLINKS tag can be used to select whether or not files or
876875
# directories that are symbolic links (a Unix file system feature) are excluded
@@ -890,8 +889,7 @@ EXCLUDE_PATTERNS = */.git/* \
890889
*/bin/* \
891890
*/obj/* \
892891
*/itext.tests/* \
893-
*/KeyVersionAttribute.cs \
894-
*/TypographyVersionAttribute.cs
892+
*/KeyVersionAttribute.cs
895893

896894
# The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names
897895
# (namespaces, classes, functions, etc.) that should be excluded from the
@@ -2527,4 +2525,3 @@ GENERATE_LEGEND = YES
25272525
# This tag requires that the tag HAVE_DOT is set to YES.
25282526

25292527
DOT_CLEANUP = YES
2530-

‎itext.tests/itext.html2pdf.tests/Properties/AssemblyInfo.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
[assembly: Guid("ae4e5743-0665-4705-9a33-07ea57cdd269")]
1717

18-
[assembly: AssemblyVersion("3.0.5.0")]
19-
[assembly: AssemblyFileVersion("3.0.5.0")]
20-
[assembly: AssemblyInformationalVersion("3.0.5")]
18+
[assembly: AssemblyVersion("4.0.0.0")]
19+
[assembly: AssemblyFileVersion("4.0.0.0")]
20+
[assembly: AssemblyInformationalVersion("4.0.0")]
2121

2222
#if !NETSTANDARD2_0
2323
[assembly: NUnit.Framework.Timeout(300000)]

‎itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.csproj

+85-20
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0" DefaultTargets="Build">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4-
<Import Project="$(SolutionDir)\packages\itext7.pdftest.7.1.16\build\itext7.pdftest.props" Condition="Exists('$(SolutionDir)\packages\itext7.pdftest.7.1.16\build\itext7.pdftest.props')" />
4+
<Import Project="$(SolutionDir)\packages\itext7.pdftest.7.2.0\build\itext7.pdftest.props" Condition="Exists('$(SolutionDir)\packages\itext7.pdftest.7.2.0\build\itext7.pdftest.props')" />
55
<PropertyGroup>
66
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
77
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace />
1212
<AssemblyName>itext.html2pdf.tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
@@ -35,12 +35,70 @@
3535
<NoWarn>CS1591;CS1570;CS1572;CS1573;CS1574;CS1580;CS1584;CS1658</NoWarn>
3636
</PropertyGroup>
3737
<ItemGroup>
38+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
39+
<HintPath>$(SolutionDir)\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
40+
<Private>True</Private>
41+
</Reference>
42+
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
43+
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
44+
<Private>True</Private>
45+
</Reference>
46+
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
47+
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
48+
<Private>True</Private>
49+
</Reference>
50+
<Reference Include="Microsoft.Extensions.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
51+
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
54+
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
55+
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
58+
<Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
59+
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
60+
<Private>True</Private>
61+
</Reference>
62+
<Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
63+
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
64+
<Private>True</Private>
65+
</Reference>
66+
<Reference Include="mscorlib" />
3867
<Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
3968
<HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
4069
<Private>True</Private>
4170
</Reference>
4271
<Reference Include="System" />
72+
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
73+
<HintPath>$(SolutionDir)\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
74+
<Private>True</Private>
75+
</Reference>
4376
<Reference Include="System.Core" />
77+
<Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
78+
<HintPath>$(SolutionDir)\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
79+
<Private>True</Private>
80+
</Reference>
81+
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
82+
<HintPath>$(SolutionDir)\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
83+
<Private>True</Private>
84+
</Reference>
85+
<Reference Include="System.Numerics" />
86+
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
87+
<HintPath>$(SolutionDir)\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
88+
<Private>True</Private>
89+
</Reference>
90+
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
91+
<HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
92+
<Private>True</Private>
93+
</Reference>
94+
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
95+
<HintPath>$(SolutionDir)\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
96+
<Private>True</Private>
97+
</Reference>
98+
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
99+
<HintPath>$(SolutionDir)\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
100+
<Private>True</Private>
101+
</Reference>
44102
</ItemGroup>
45103
<ItemGroup>
46104
<Compile Include="itext\html2pdf\**\*.cs" />
@@ -51,22 +109,29 @@
51109
<Project>{e2828ac4-3c63-4b2a-b5ad-5f98862775be}</Project>
52110
<Name>itext.forms</Name>
53111
</ProjectReference>
54-
<Reference Include="itext.forms, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')">
55-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.forms.dll</HintPath>
112+
<Reference Include="itext.forms, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')">
113+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.forms.dll</HintPath>
56114
</Reference>
57115
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
58116
<Project>{56137079-541A-425A-AB97-43AF63793C97}</Project>
59117
<Name>itext.hyph</Name>
60118
</ProjectReference>
61-
<Reference Include="itext.hyph, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
62-
<HintPath>$(SolutionDir)\packages\itext7.hyph.7.1.16\lib\net45\itext.hyph.dll</HintPath>
119+
<Reference Include="itext.hyph, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
120+
<HintPath>$(SolutionDir)\packages\itext7.hyph.7.2.0\lib\net461\itext.hyph.dll</HintPath>
63121
</Reference>
64122
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
65123
<Project>{cee5e7e1-1bf0-4be1-9941-903262ce2f83}</Project>
66124
<Name>itext.io</Name>
67125
</ProjectReference>
68-
<Reference Include="itext.io, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
69-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.io.dll</HintPath>
126+
<Reference Include="itext.io, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
127+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.io.dll</HintPath>
128+
</Reference>
129+
<ProjectReference Include="..\..\..\itextcore\itext\itext.commons\itext.commons.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.commons\itext.commons.csproj')">
130+
<Project>{339569D2-3BA2-41CC-972C-70B05E4C4FCD}</Project>
131+
<Name>itext.commons</Name>
132+
</ProjectReference>
133+
<Reference Include="itext.commons, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.commons\itext.commons.csproj')">
134+
<HintPath>$(SolutionDir)\packages\itext7.commons.7.2.0\lib\net461\itext.commons.dll</HintPath>
70135
</Reference>
71136
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
72137
<Project>{4e7819e8-7555-4e2e-9a01-d8718a2cfdda}</Project>
@@ -75,43 +140,43 @@
75140
<Reference Include="BouncyCastle.Crypto, Version=1.8.9.0, Culture=neutral, PublicKeyToken=0e99375e54769942" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
76141
<HintPath>$(SolutionDir)\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
77142
</Reference>
78-
<Reference Include="itext.kernel, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
79-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.kernel.dll</HintPath>
143+
<Reference Include="itext.kernel, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
144+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.kernel.dll</HintPath>
80145
</Reference>
81146
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
82147
<Project>{42173642-db52-44d3-9883-3e34c65c53bc}</Project>
83148
<Name>itext.layout</Name>
84149
</ProjectReference>
85-
<Reference Include="itext.layout, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
86-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.layout.dll</HintPath>
150+
<Reference Include="itext.layout, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
151+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.layout.dll</HintPath>
87152
</Reference>
88153
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
89154
<Project>{9fc2f0b3-a8d2-46da-8724-72e00e67a8fa}</Project>
90155
<Name>itext.pdfa</Name>
91156
</ProjectReference>
92-
<Reference Include="itext.pdfa, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
93-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.pdfa.dll</HintPath>
157+
<Reference Include="itext.pdfa, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
158+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.pdfa.dll</HintPath>
94159
</Reference>
95160
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
96161
<Project>{f9880dc4-f015-4413-af86-66d0e9512774}</Project>
97162
<Name>itext.pdftest</Name>
98163
</ProjectReference>
99-
<Reference Include="itext.pdftest, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
100-
<HintPath>$(SolutionDir)\packages\itext7.pdftest.7.1.16\lib\net45\itext.pdftest.dll</HintPath>
164+
<Reference Include="itext.pdftest, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
165+
<HintPath>$(SolutionDir)\packages\itext7.pdftest.7.2.0\lib\net461\itext.pdftest.dll</HintPath>
101166
</Reference>
102167
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
103168
<Project>{8636f290-00df-403e-b841-e4bfd6d9ce7a}</Project>
104169
<Name>itext.styledxmlparser</Name>
105170
</ProjectReference>
106-
<Reference Include="itext.styledxmlparser, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
107-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.styledxmlparser.dll</HintPath>
171+
<Reference Include="itext.styledxmlparser, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
172+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.styledxmlparser.dll</HintPath>
108173
</Reference>
109174
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
110175
<Project>{ddec35d2-5781-471d-5ea1-a6e433eddb11}</Project>
111176
<Name>itext.svg</Name>
112177
</ProjectReference>
113-
<Reference Include="itext.svg, Version=7.1.16.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
114-
<HintPath>$(SolutionDir)\packages\itext7.7.1.16\lib\net45\itext.svg.dll</HintPath>
178+
<Reference Include="itext.svg, Version=7.2.0.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
179+
<HintPath>$(SolutionDir)\packages\itext7.7.2.0\lib\net461\itext.svg.dll</HintPath>
115180
</Reference>
116181
<ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.csproj">
117182
<Project>{ff6ba09d-3655-466a-8c17-a7bfd3479ca1}</Project>

0 commit comments

Comments
 (0)