Skip to content

Commit 91a0578

Browse files
committed
Merge remote-tracking branch 'original/develop' into portable
# Conflicts: # itextsharp.nuspec # itextsharp.pdfa.nuspec # itextsharp.xmlworker.nuspec # itextsharp.xtra.nuspec # src/core/AssemblyInfo.cs # src/core/iTextSharp/text/pdf/PdfPublicKeySecurityHandler.cs # src/core/iTextSharp/text/pdf/crypto/AESCipher.cs # src/core/iTextSharp/text/pdf/crypto/AESCipherCBCnoPad.cs # src/core/iTextSharp/text/pdf/security/CertificateVerification.cs # src/core/iTextSharp/text/pdf/security/OcspClientBouncyCastle.cs # src/core/iTextSharp/text/pdf/security/OcspVerifier.cs # src/core/iTextSharp/text/pdf/security/PdfPKCS7.cs # src/core/iTextSharp/text/pdf/security/SignaturePolicyInfo.cs # src/core/iTextSharp/xmp/impl/XmpSerializerRdf.cs # src/core/itextsharp(VS2010).csproj # src/extras/iTextAsian/iTextAsian(VS2010).csproj # src/extras/iTextSharp.xtra/Properties/AssemblyInfo.cs # src/extras/iTextSharp.xtra/iTextSharp.xtra(VS2010).csproj # src/extras/itext-hyph-xml/itext-hyph-xml(VS2010).csproj # src/extras/itextsharp.pdfa.tests/Properties/AssemblyInfo.cs # src/extras/itextsharp.pdfa.tests/itextsharp.pdfa.tests(VS2010).csproj # src/extras/itextsharp.pdfa/Properties/AssemblyInfo.cs # src/extras/itextsharp.pdfa/itextsharp.pdfa(VS2010).csproj # src/extras/itextsharp.tests/Properties/AssemblyInfo.cs # src/extras/itextsharp.tests/itextsharp.tests(VS2010).csproj # src/extras/itextsharp.tests/packages.config # src/extras/itextsharp.xmlworker.tests/Properties/AssemblyInfo.cs # src/extras/itextsharp.xmlworker.tests/itextsharp.xmlworker.tests(VS2010).csproj # src/extras/itextsharp.xmlworker/Properties/AssemblyInfo.cs # src/extras/itextsharp.xmlworker/itextsharp.xmlworker(VS2010).csproj
2 parents f76f859 + 4fe98cb commit 91a0578

File tree

148 files changed

+524
-5113
lines changed

Some content is hidden

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

148 files changed

+524
-5113
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
### **PLEASE NOTE: iTextSharp is EOL, and has been replaced by [iText 7][itext7]. Only security fixes will be added**
1+
### **PLEASE NOTE: iTextSharp is EOL, and has been replaced by [iText 7][itext]. Only security fixes will be added**
22

33
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
44

@@ -51,4 +51,4 @@ Contact sales for more info: http://itextpdf.com/sales
5151
[building]: BUILDING.md
5252
[gratis]: https://en.wikipedia.org/wiki/Gratis_versus_libre
5353
[itext]: http://itextpdf.com/
54-
[itext7]: https://github.com/itext/itext7-dotnet
54+
[itext]: https://github.com/itext/itext-dotnet

iTextAsian.nuspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<projectUrl>https://itextpdf.com/</projectUrl>
1111
<iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
13+
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
1414

15-
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
15+
We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
1616
- HTML to PDF (PDF/A) conversion
1717
- PDF Redaction
1818
- SVG support
@@ -24,15 +24,15 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
2424
- Extra practical add-ons
2525
- Encryption, hashing and digital signatures
2626

27-
This DEPRECATED library adds extra functionality for iTextSharp. Please use iText 7 instead. iText 7 Community: https://www.nuget.org/packages/itext7/ and iText 7 pdfSweep addon: https://www.nuget.org/packages/itext7.pdfsweep/</description>
28-
<summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText 7 instead.
29-
iText Community: https://www.nuget.org/packages/itext7/</summary>
27+
This DEPRECATED library adds extra functionality for iTextSharp. Please use iText instead. iText Community: https://www.nuget.org/packages/itext/ and iText pdfSweep addon: https://www.nuget.org/packages/itext.pdfsweep/</description>
28+
<summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText instead.
29+
iText Community: https://www.nuget.org/packages/itext/</summary>
3030
<copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
3131
<language>en-US</language>
3232
<tags>itext itextsharp c# csharp .net pdf</tags>
3333
</metadata>
3434

3535
<files>
36-
<file src="src\extras\iTextAsian\bin\Release\iTextAsian.dll" target="lib\" />
36+
<file src="src\extras\iTextAsian\bin\Release\net461\iTextAsian.dll" target="lib\net461" />
3737
</files>
3838
</package>

itext-hyph-xml.nuspec

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
<projectUrl>https://itextpdf.com/</projectUrl>
1111
<iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
13+
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
1414

15-
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
15+
We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
1616
- HTML to PDF (PDF/A) conversion
1717
- PDF Redaction
1818
- SVG support
@@ -24,15 +24,15 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
2424
- Extra practical add-ons
2525
- Encryption, hashing and digital signatures
2626

27-
This DEPRECATED library adds extra functionality for iTextSharp. Please use iText 7 instead. iText 7 Community: https://www.nuget.org/packages/itext7/ and iText 7 pdfSweep addon: https://www.nuget.org/packages/itext7.pdfsweep/</description>
28-
<summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText 7 instead.
29-
iText Community: https://www.nuget.org/packages/itext7/</summary>
27+
This DEPRECATED library adds extra functionality for iTextSharp. Please use iText instead. iText Community: https://www.nuget.org/packages/itext/ and iText pdfSweep addon: https://www.nuget.org/packages/itext.pdfsweep/</description>
28+
<summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText instead.
29+
iText Community: https://www.nuget.org/packages/itext/</summary>
3030
<copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
3131
<language>en-US</language>
3232
<tags>itext itextsharp c# csharp .net pdf</tags>
3333
</metadata>
3434

3535
<files>
36-
<file src="src\extras\itext-hyph-xml\bin\Release\itext-hyph-xml.dll" target="lib\" />
36+
<file src="src\extras\itext-hyph-xml\bin\Release\net461\itext-hyph-xml.dll" target="lib\net461" />
3737
</files>
3838
</package>

itextsharp.nuspec

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>iTextSharp.portable</id>
5-
<version>5.5.13.3</version>
5+
<version>5.5.13.4</version>
66
<title>iTextSharp Portable</title>
77
<authors>iText Software</authors>
88
<owners>Bruno Lowagie,Paulo Soares</owners>
99
<licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
1010
<projectUrl>https://itextpdf.com/</projectUrl>
1111
<iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
13+
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
1414

15-
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
15+
We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
1616
- HTML to PDF (PDF/A) conversion
1717
- PDF Redaction
1818
- SVG support
@@ -26,26 +26,28 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
2626

2727
iText is a PDF library that allows you to CREATE, ADAPT, INSPECT and MAINTAIN documents in the Portable Document Format (PDF), allowing you to add PDF functionality to your software projects with ease. We even have documentation to help you get coding.
2828

29-
iText 7 is available under AGPL and Commercial license. iText 7 Community: https://www.nuget.org/packages/itext7/
29+
iText is available under AGPL and Commercial license. iText Community: https://www.nuget.org/packages/itext/
3030

31-
iText 7 is a complete re-write of iText 5, allowing you to choose your adventure with add-ons, all based on a simple, modular code structure that is easy to use and well documented.
31+
iText is a complete re-write of iText 5, allowing you to choose your adventure with add-ons, all based on a simple, modular code structure that is easy to use and well documented.
3232

33-
iText 7 includes pdfDebug, the first debugging tool that gives you a clear overview of your content streams and document structure as well as pdfCalligraph, allowing you to leverage advanced typography.
33+
iText includes pdfDebug, the first debugging tool that gives you a clear overview of your content streams and document structure as well as pdfCalligraph, allowing you to leverage advanced typography.
3434

3535
Several iText engineers are actively supporting the project on StackOverflow: https://stackoverflow.com/questions/tagged/itext</description>
36-
<summary>iTextSharp is a DEPRECATED library for PDF generation written entirely in C# for the .NET platform. Please use iText 7 instead.
37-
iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
36+
<summary>iTextSharp is a DEPRECATED library for PDF generation written entirely in C# for the .NET platform. Please use iText instead.
37+
iText Community: https://www.nuget.org/packages/itext/</summary>
3838
<copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
3939
<language>en-US</language>
4040
<tags>itext itextsharp c# .net csharp pdf</tags>
41-
<dependencies>
42-
<dependency id="BouncyCastle" version="1.8.9" />
41+
<dependencies>
42+
<group targetFramework="net461">
43+
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
44+
</group>
4345
</dependencies>
4446
</metadata>
4547

4648
<files>
47-
<file src="src\core\bin\Release\itextsharp.dll" target="lib\" />
48-
<file src="src\core\bin\Release\itextsharp.xml" target="lib\" />
49+
<file src="src\core\bin\Release\net461\itextsharp.dll" target="lib\net461" />
50+
<file src="src\core\bin\Release\net461\itextsharp.xml" target="lib\net461" />
4951
<file src="src\notice.txt" target="" />
5052
<file src="gnu-agpl-v3.0.md" target="" />
5153
<file src="LICENSE.md" target="" />

itextsharp.pdfa.nuspec

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>itextsharp.pdfa.portable</id>
5-
<version>5.5.13.3</version>
5+
<version>5.5.13.4</version>
66
<title>iTextSharp.pdfa Portable</title>
77
<authors>iText Software</authors>
88
<owners>Bruno Lowagie,Paulo Soares,et al.</owners>
99
<licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
1010
<projectUrl>https://itextpdf.com/</projectUrl>
1111
<iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
13+
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
1414

15-
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
15+
We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
1616
- HTML to PDF (PDF/A) conversion
1717
- PDF Redaction
1818
- SVG support
@@ -24,19 +24,19 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
2424
- Extra practical add-ons
2525
- Encryption, hashing and digital signatures
2626

27-
The iTextSharp.pdfa adds PDF/A-related functionality for iTextSharp. The same funcionality is present in pdfa module of iText 7 Community: https://www.nuget.org/packages/itext7/</description>
28-
<summary>Extra functionality for DEPRECATED iTextSharp library for PDF generation written entirely in C# for the .NET platform. Please use itext7 instead.
29-
iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
27+
The iTextSharp.pdfa adds PDF/A-related functionality for iTextSharp. The same funcionality is present in pdfa module of iText Community: https://www.nuget.org/packages/itext/</description>
28+
<summary>Extra functionality for DEPRECATED iTextSharp library for PDF generation written entirely in C# for the .NET platform. Please use itext instead.
29+
iText Community: https://www.nuget.org/packages/itext/</summary>
3030
<copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
3131
<language>en-US</language>
3232
<tags>itext itextsharp c# csharp .net pdf pdfa</tags>
3333
<dependencies>
34-
<dependency id="iTextSharp" version="5.5.13.3" />
34+
<dependency id="iTextSharp" version="5.5.13.4" />
3535
</dependencies>
3636
</metadata>
3737

38-
<files>
39-
<file src="src\extras\itextsharp.pdfa\bin\Release\itextsharp.pdfa.dll" target="lib\" />
38+
<files>
39+
<file src="src\extras\itextsharp.pdfa\bin\Release\net461\itextsharp.pdfa.dll" target="lib\net461" />
4040
<file src="gnu-agpl-v3.0.md" target="" />
4141
<file src="LICENSE.md" target="" />
4242
</files>

itextsharp.xmlworker.nuspec

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>itextsharp.xmlworker.portable</id>
5-
<version>5.5.13.3</version>
5+
<version>5.5.13.4</version>
66
<title>iTextSharp XML Worker Portable</title>
77
<authors>iText Software</authors>
88
<owners>Bruno Lowagie,Paulo Soares,et al.</owners>
99
<licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
1010
<projectUrl>https://itextpdf.com/</projectUrl>
1111
<iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
13+
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
1414

15-
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
15+
We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
1616
- HTML to PDF (PDF/A) conversion
1717
- PDF Redaction
1818
- SVG support
@@ -24,20 +24,20 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
2424
- Extra practical add-ons
2525
- Encryption, hashing and digital signatures
2626

27-
This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText7 pdfHTML addon https://www.nuget.org/packages/itext7.pdfhtml/ and iText 7 Community: https://www.nuget.org/packages/itext7/
27+
This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText pdfHTML addon https://www.nuget.org/packages/itext.pdfhtml/ and iText Community: https://www.nuget.org/packages/itext/
2828

2929
XMLWorker is an extra component for iTextSharp. The first XML to PDF implementation, is a new version of the old HTMLWorker that used to be shipped with iTextSharp.</description>
30-
<summary>This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText 7 pdfHTML addon https://www.nuget.org/packages/itext7.pdfhtml/ and iText 7 Community: https://www.nuget.org/packages/itext7/</summary>
30+
<summary>This DEPRECATED tool parses (X)HTML snippets and the associated CSS and converts them to PDF. It is replaced by iText pdfHTML addon https://www.nuget.org/packages/itext.pdfhtml/ and iText Community: https://www.nuget.org/packages/itext/</summary>
3131
<copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
3232
<language>en-US</language>
3333
<tags>itext itextsharp c# csharp xml worker pdf html xhtml css</tags>
3434
<dependencies>
35-
<dependency id="iTextSharp" version="5.5.13.3" />
35+
<dependency id="iTextSharp" version="5.5.13.4" />
3636
</dependencies>
3737
</metadata>
3838

3939
<files>
40-
<file src="src\extras\itextsharp.xmlworker\bin\Release\itextsharp.xmlworker.dll" target="lib\" />
40+
<file src="src\extras\itextsharp.xmlworker\bin\Release\net461\itextsharp.xmlworker.dll" target="lib\net461" />
4141
<file src="gnu-agpl-v3.0.md" target="" />
4242
<file src="LICENSE.md" target="" />
4343
</files>

itextsharp.xtra.nuspec

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>itextsharp.xtra.portable</id>
5-
<version>5.5.13.3</version>
5+
<version>5.5.13.4</version>
66
<title>iTextSharp.xtra Portable</title>
77
<authors>iText Software</authors>
88
<owners>Bruno Lowagie,Paulo Soares,et al.</owners>
99
<licenseUrl>https://www.gnu.org/licenses/agpl.html</licenseUrl>
1010
<projectUrl>https://itextpdf.com/</projectUrl>
1111
<iconUrl>https://itextpdf.com/sites/default/files/ITSC-avatar.png</iconUrl>
1212
<requireLicenseAcceptance>true</requireLicenseAcceptance>
13-
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText 7. Only security fixes will be added
13+
<description>PLEASE NOTE: iTextSharp is EOL, and has been replaced by iText. Only security fixes will be added
1414

15-
We HIGHLY recommend customers use iText 7 for new projects, and to consider moving existing projects from iTextSharp to iText 7 to benefit from the many improvements such as:
15+
We HIGHLY recommend customers use iText for new projects, and to consider moving existing projects from iTextSharp to iText to benefit from the many improvements such as:
1616
- HTML to PDF (PDF/A) conversion
1717
- PDF Redaction
1818
- SVG support
@@ -24,19 +24,19 @@ We HIGHLY recommend customers use iText 7 for new projects, and to consider movi
2424
- Extra practical add-ons
2525
- Encryption, hashing and digital signatures
2626

27-
This DEPRECATED library adds extra functionality for iTextSharp. Please use iText 7 instead. iText 7 Community: https://www.nuget.org/packages/itext7/ and iText 7 pdfSweep addon: https://www.nuget.org/packages/itext7.pdfsweep/</description>
28-
<summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText 7 instead.
29-
iText Community: https://www.nuget.org/packages/itext7/</summary>
27+
This DEPRECATED library adds extra functionality for iTextSharp. Please use iText instead. iText Community: https://www.nuget.org/packages/itext/ and iText pdfSweep addon: https://www.nuget.org/packages/itext.pdfsweep/</description>
28+
<summary>Extra functionality for DEPRECACTED iTextSharp PDF generation library written entirely in C# for the .NET platform. Please use iText instead.
29+
iText Community: https://www.nuget.org/packages/itext/</summary>
3030
<copyright>Copyright (c) 1998-2022 iText Group NV</copyright>
3131
<language>en-US</language>
3232
<tags>itext itextsharp c# csharp .net pdf</tags>
3333
<dependencies>
34-
<dependency id="iTextSharp" version="5.5.13.3" />
34+
<dependency id="iTextSharp" version="5.5.13.4" />
3535
</dependencies>
3636
</metadata>
3737

3838
<files>
39-
<file src="src\extras\itextsharp.xtra\bin\Release\itextsharp.xtra.dll" target="lib\" />
39+
<file src="src\extras\itextsharp.xtra\bin\Release\net461\itextsharp.xtra.dll" target="lib\net461" />
4040
<file src="gnu-agpl-v3.0.md" target="" />
4141
<file src="LICENSE.md" target="" />
4242
</files>

0 commit comments

Comments
 (0)