diff --git a/.gitignore b/.gitignore index b338a8d963..635a556a56 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,7 @@ [Dd]ebugPublic/ [Rr]elease/ [Rr]eleases/ +[Pp]ackages/ x64/ x86/ build/ diff --git a/Build.Debug.bat b/Build.Debug.bat new file mode 100644 index 0000000000..29e1dd5e93 --- /dev/null +++ b/Build.Debug.bat @@ -0,0 +1,13 @@ +del Packages\Net4x.itext7.* +rmdir /s /q %userprofile%\.nuget\Packages\Net4x.itext7 +del Packages\Net4x.itext7.commons.* +rmdir /s /q %userprofile%\.nuget\Packages\Net4x.itext7.commons +nuget.exe restore iTextCore.sln +MSBuild.exe iTextCore.sln -m /property:Configuration=Debug +cd NuSpecs.Debug +nuget pack -OutputDirectory ..\Packages Net4x.itext7-commons.nuspec +nuget pack -OutputDirectory ..\Packages Net4x.itext7.nuspec +cd .. +git add -A +git commit -a --allow-empty-message -m '' +git push \ No newline at end of file diff --git a/Build.bat b/Build.bat new file mode 100644 index 0000000000..80d508a8f8 --- /dev/null +++ b/Build.bat @@ -0,0 +1,13 @@ +del Packages\Net4x.itext7.* +rmdir /s /q %userprofile%\.nuget\Packages\Net4x.itext7 +del Packages\Net4x.itext7.commons.* +rmdir /s /q %userprofile%\.nuget\Packages\Net4x.itext7.commons +nuget.exe restore iTextCore.sln +MSBuild.exe iTextCore.sln -m /property:Configuration=Release +cd NuSpecs +nuget pack -OutputDirectory ..\Packages Net4x.itext7-commons.nuspec +nuget pack -OutputDirectory ..\Packages Net4x.itext7.nuspec +cd .. +git add -A +git commit -a --allow-empty-message -m '' +git push \ No newline at end of file diff --git a/NuSpecs.Debug/Net4x.itext7-commons.nuspec b/NuSpecs.Debug/Net4x.itext7-commons.nuspec new file mode 100644 index 0000000000..48d45f2a15 --- /dev/null +++ b/NuSpecs.Debug/Net4x.itext7-commons.nuspec @@ -0,0 +1,55 @@ + + + + Net4x.itext7.commons + 7.2.6 + iText 7 commons module + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + Commons module + + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs.Debug/Net4x.itext7.nuspec b/NuSpecs.Debug/Net4x.itext7.nuspec new file mode 100644 index 0000000000..aa399211dc --- /dev/null +++ b/NuSpecs.Debug/Net4x.itext7.nuspec @@ -0,0 +1,177 @@ + + + + Net4x.itext7 + 7.2.6 + iText 7 Community + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + iText 7 represents the next level of SDKs for developers that want to take advantage of the benefits PDF can bring. Equipped with a better document engine, high- and low-level programming capabilities and the ability to create, edit and enhance PDF documents, iText 7 can be a boon to nearly every workflow. iText 7 allows you to build custom PDF scenarios for web, mobile, desktop or cloud apps in .NET. + iText for .NET is a library for PDF generation written entirely in C# for the .NET platform. + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp pdf itextcore core fdf xfa acroform forms svg digital-signatures signing security accessibility opensource open source + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs.Debug/itext7-commons.nuspec b/NuSpecs.Debug/itext7-commons.nuspec new file mode 100644 index 0000000000..a29e8e7606 --- /dev/null +++ b/NuSpecs.Debug/itext7-commons.nuspec @@ -0,0 +1,48 @@ + + + + itext7.commons + 7.2.6 + iText 7 commons module + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + Commons module + + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs.Debug/itext7.nuspec b/NuSpecs.Debug/itext7.nuspec new file mode 100644 index 0000000000..ebcbcd6e0a --- /dev/null +++ b/NuSpecs.Debug/itext7.nuspec @@ -0,0 +1,137 @@ + + + + itext7 + 7.2.6 + iText 7 Community + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + iText 7 represents the next level of SDKs for developers that want to take advantage of the benefits PDF can bring. Equipped with a better document engine, high- and low-level programming capabilities and the ability to create, edit and enhance PDF documents, iText 7 can be a boon to nearly every workflow. iText 7 allows you to build custom PDF scenarios for web, mobile, desktop or cloud apps in .NET. + iText for .NET is a library for PDF generation written entirely in C# for the .NET platform. + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp pdf itextcore core fdf xfa acroform forms svg digital-signatures signing security accessibility opensource open source + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs/Net4x.itext7-commons.nuspec b/NuSpecs/Net4x.itext7-commons.nuspec new file mode 100644 index 0000000000..6c0d004635 --- /dev/null +++ b/NuSpecs/Net4x.itext7-commons.nuspec @@ -0,0 +1,50 @@ + + + + Net4x.itext7.commons + 7.2.6 + iText 7 commons module + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + Commons module + + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs/Net4x.itext7.nuspec b/NuSpecs/Net4x.itext7.nuspec new file mode 100644 index 0000000000..8b66c521dc --- /dev/null +++ b/NuSpecs/Net4x.itext7.nuspec @@ -0,0 +1,137 @@ + + + + Net4x.itext7 + 7.2.6 + iText 7 Community + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + iText 7 represents the next level of SDKs for developers that want to take advantage of the benefits PDF can bring. Equipped with a better document engine, high- and low-level programming capabilities and the ability to create, edit and enhance PDF documents, iText 7 can be a boon to nearly every workflow. iText 7 allows you to build custom PDF scenarios for web, mobile, desktop or cloud apps in .NET. + iText for .NET is a library for PDF generation written entirely in C# for the .NET platform. + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp pdf itextcore core fdf xfa acroform forms svg digital-signatures signing security accessibility opensource open source + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs/itext7-commons.nuspec b/NuSpecs/itext7-commons.nuspec new file mode 100644 index 0000000000..641d863042 --- /dev/null +++ b/NuSpecs/itext7-commons.nuspec @@ -0,0 +1,50 @@ + + + + itext7.commons + 7.2.6 + iText 7 commons module + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + Commons module + + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/NuSpecs/itext7.nuspec b/NuSpecs/itext7.nuspec new file mode 100644 index 0000000000..7cf4e8b2ec --- /dev/null +++ b/NuSpecs/itext7.nuspec @@ -0,0 +1,132 @@ + + + + itext7 + 7.2.6 + iText 7 Community + iText Software + iText Software + https://www.gnu.org/licenses/agpl.html + https://itextpdf.com/ + ITSC-avatar.png + true + iText 7 represents the next level of SDKs for developers that want to take advantage of the benefits PDF can bring. Equipped with a better document engine, high- and low-level programming capabilities and the ability to create, edit and enhance PDF documents, iText 7 can be a boon to nearly every workflow. iText 7 allows you to build custom PDF scenarios for web, mobile, desktop or cloud apps in .NET. + iText for .NET is a library for PDF generation written entirely in C# for the .NET platform. + https://itextpdf.com/itext7release + Copyright (c) 1998-2022 iText Group NV + en-US + itext itext7 itextsharp c# .net csharp pdf itextcore core fdf xfa acroform forms svg digital-signatures signing security accessibility opensource open source + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Nuget.Config b/Nuget.Config new file mode 100644 index 0000000000..ce8e318bee --- /dev/null +++ b/Nuget.Config @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/iTextCore.sln b/iTextCore.sln index 2ef8d4466b..167a0ea046 100644 --- a/iTextCore.sln +++ b/iTextCore.sln @@ -1,55 +1,78 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26430.15 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.32802.440 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.io.netstandard", "itext\itext.io\itext.io.csproj", "{4C4C74D4-00E2-43A4-9D7A-54352096DE32}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.io", "itext\itext.io\itext.io.csproj", "{4C4C74D4-00E2-43A4-9D7A-54352096DE32}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdftest.netstandard", "itext\itext.pdftest\itext.pdftest.csproj", "{9BE8BB63-8A73-4348-9387-F47377B9F1BF}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdftest", "itext\itext.pdftest\itext.pdftest.csproj", "{9BE8BB63-8A73-4348-9387-F47377B9F1BF}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.io.tests.netstandard", "itext.tests\itext.io.tests\itext.io.tests.csproj", "{DC025E65-67E8-47BD-B135-1B71C05EE35E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.io.tests", "itext.tests\itext.io.tests\itext.io.tests.csproj", "{DC025E65-67E8-47BD-B135-1B71C05EE35E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.kernel.netstandard", "itext\itext.kernel\itext.kernel.csproj", "{76166842-A194-43B3-B5C0-4C78B845DABA}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.kernel", "itext\itext.kernel\itext.kernel.csproj", "{76166842-A194-43B3-B5C0-4C78B845DABA}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.kernel.tests.netstandard", "itext.tests\itext.kernel.tests\itext.kernel.tests.csproj", "{9EB233B4-5821-49DC-959E-F7BBA3D6DEB0}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.kernel.tests", "itext.tests\itext.kernel.tests\itext.kernel.tests.csproj", "{9EB233B4-5821-49DC-959E-F7BBA3D6DEB0}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.layout.netstandard", "itext\itext.layout\itext.layout.csproj", "{7CACC13D-D87F-4AE3-9B07-6B94F1798AE8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.layout", "itext\itext.layout\itext.layout.csproj", "{7CACC13D-D87F-4AE3-9B07-6B94F1798AE8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdfa.netstandard", "itext\itext.pdfa\itext.pdfa.csproj", "{6BF0A6C3-8982-4507-B704-C0878243B322}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdfa", "itext\itext.pdfa\itext.pdfa.csproj", "{6BF0A6C3-8982-4507-B704-C0878243B322}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.forms.netstandard", "itext\itext.forms\itext.forms.csproj", "{22FE2361-9580-43BC-98A7-608CFCAE4E8F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.forms", "itext\itext.forms\itext.forms.csproj", "{22FE2361-9580-43BC-98A7-608CFCAE4E8F}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.barcodes.netstandard", "itext\itext.barcodes\itext.barcodes.csproj", "{ED4A03D3-DFC7-4760-9066-D01D4134627D}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.barcodes", "itext\itext.barcodes\itext.barcodes.csproj", "{ED4A03D3-DFC7-4760-9066-D01D4134627D}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.font-asian.netstandard", "itext\itext.font-asian\itext.font-asian.csproj", "{C3D759CE-C105-4566-A125-FBD77CFC7A82}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.font-asian", "itext\itext.font-asian\itext.font-asian.csproj", "{C3D759CE-C105-4566-A125-FBD77CFC7A82}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.hyph.netstandard", "itext\itext.hyph\itext.hyph.csproj", "{9AB67CFB-6695-4769-8E21-9BA0A12BD67C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.hyph", "itext\itext.hyph\itext.hyph.csproj", "{9AB67CFB-6695-4769-8E21-9BA0A12BD67C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.sign.netstandard", "itext\itext.sign\itext.sign.csproj", "{F284CE2A-821F-4B04-8CE3-558DAC5F8674}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.sign", "itext\itext.sign\itext.sign.csproj", "{F284CE2A-821F-4B04-8CE3-558DAC5F8674}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.barcodes.tests.netstandard", "itext.tests\itext.barcodes.tests\itext.barcodes.tests.csproj", "{4BB4B5FD-1EE1-4558-B126-E9E18BC45876}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.barcodes.tests", "itext.tests\itext.barcodes.tests\itext.barcodes.tests.csproj", "{4BB4B5FD-1EE1-4558-B126-E9E18BC45876}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.forms.tests.netstandard", "itext.tests\itext.forms.tests\itext.forms.tests.csproj", "{732D6882-40DF-41CB-8A18-ED43D4757177}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.forms.tests", "itext.tests\itext.forms.tests\itext.forms.tests.csproj", "{732D6882-40DF-41CB-8A18-ED43D4757177}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.layout.tests.netstandard", "itext.tests\itext.layout.tests\itext.layout.tests.csproj", "{620C13EC-D9B8-4F49-B536-5DD7E08B3984}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.layout.tests", "itext.tests\itext.layout.tests\itext.layout.tests.csproj", "{620C13EC-D9B8-4F49-B536-5DD7E08B3984}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdfa.tests.netstandard", "itext.tests\itext.pdfa.tests\itext.pdfa.tests.csproj", "{BA6474C1-E64B-4522-8D8B-A7AE10D2ED86}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdfa.tests", "itext.tests\itext.pdfa.tests\itext.pdfa.tests.csproj", "{BA6474C1-E64B-4522-8D8B-A7AE10D2ED86}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.sign.tests.netstandard", "itext.tests\itext.sign.tests\itext.sign.tests.csproj", "{22C91DB4-51CD-4339-B904-E5FE38B271CD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.sign.tests", "itext.tests\itext.sign.tests\itext.sign.tests.csproj", "{22C91DB4-51CD-4339-B904-E5FE38B271CD}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.styledxmlparser.netstandard", "itext\itext.styledxmlparser\itext.styledxmlparser.csproj", "{6894C148-5379-4D63-AC21-D67BD04AA064}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.styledxmlparser", "itext\itext.styledxmlparser\itext.styledxmlparser.csproj", "{6894C148-5379-4D63-AC21-D67BD04AA064}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.styledxmlparser.tests.netstandard", "itext.tests\itext.styledxmlparser.tests\itext.styledxmlparser.tests.csproj", "{2785E385-0940-4023-9868-8CDD25998176}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.styledxmlparser.tests", "itext.tests\itext.styledxmlparser.tests\itext.styledxmlparser.tests.csproj", "{2785E385-0940-4023-9868-8CDD25998176}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.svg.netstandard", "itext\itext.svg\itext.svg.csproj", "{8D69BA6B-D165-45C1-B144-F187B72850B9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.svg", "itext\itext.svg\itext.svg.csproj", "{8D69BA6B-D165-45C1-B144-F187B72850B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.svg.tests.netstandard", "itext.tests\itext.svg.tests\itext.svg.tests.csproj", "{9F61F451-EC4F-4D1A-B339-CEDD5FA4257C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.svg.tests", "itext.tests\itext.svg.tests\itext.svg.tests.csproj", "{9F61F451-EC4F-4D1A-B339-CEDD5FA4257C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.pdftest.tests.netstandard", "itext.tests\itext.pdftest.tests\itext.pdftest.tests.csproj", "{46C393D2-BFAB-473A-AF06-E5FB586493FD}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.pdftest.tests", "itext.tests\itext.pdftest.tests\itext.pdftest.tests.csproj", "{46C393D2-BFAB-473A-AF06-E5FB586493FD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.commons.netstandard", "itext\itext.commons\itext.commons.csproj", "{6DBE9C11-7C0D-4039-B8B1-01AC743D5309}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.commons", "itext\itext.commons\itext.commons.csproj", "{6DBE9C11-7C0D-4039-B8B1-01AC743D5309}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itext.commons.tests.netstandard", "itext.tests\itext.commons.tests\itext.commons.tests.csproj", "{726AEDB2-0B0D-45B8-A744-BFFEE36A187E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "itext.commons.tests", "itext.tests\itext.commons.tests\itext.commons.tests.csproj", "{726AEDB2-0B0D-45B8-A744-BFFEE36A187E}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs", "NuSpecs", "{C9E42CFC-72EE-46F6-8552-4C166394C0A6}" + ProjectSection(SolutionItems) = preProject + NuSpecs\itext7-commons.nuspec = NuSpecs\itext7-commons.nuspec + NuSpecs\itext7.nuspec = NuSpecs\itext7.nuspec + NuSpecs\Net4x.itext7-commons.nuspec = NuSpecs\Net4x.itext7-commons.nuspec + NuSpecs\Net4x.itext7.nuspec = NuSpecs\Net4x.itext7.nuspec + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{AD676B5E-B2B6-43CA-AB11-239CC626257A}" + ProjectSection(SolutionItems) = preProject + .gitignore = .gitignore + Build.bat = Build.bat + Build.Debug.bat = Build.Debug.bat + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NuSpecs.Debug", "NuSpecs.Debug", "{5DE207F8-675E-49BD-9BEB-E4FAE648016F}" + ProjectSection(SolutionItems) = preProject + NuSpecs.Debug\itext7-commons.nuspec = NuSpecs.Debug\itext7-commons.nuspec + NuSpecs.Debug\itext7.nuspec = NuSpecs.Debug\itext7.nuspec + NuSpecs.Debug\Net4x.itext7-commons.nuspec = NuSpecs.Debug\Net4x.itext7-commons.nuspec + NuSpecs.Debug\Net4x.itext7.nuspec = NuSpecs.Debug\Net4x.itext7.nuspec + EndProjectSection EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs index 89ac2b9452..7f311b93f0 100644 --- a/itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs @@ -14,9 +14,9 @@ [assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.barcodes.tests/itext.barcodes.tests.csproj b/itext.tests/itext.barcodes.tests/itext.barcodes.tests.csproj index 9655a55084..3c63d68144 100644 --- a/itext.tests/itext.barcodes.tests/itext.barcodes.tests.csproj +++ b/itext.tests/itext.barcodes.tests/itext.barcodes.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -45,7 +45,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.commons.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.commons.tests/Properties/AssemblyInfo.cs index 2d50c9a92c..a72ba0e23c 100644 --- a/itext.tests/itext.commons.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.commons.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("502eda37-c014-4822-8e5c-4e5d21b085e9")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.commons.tests/itext.commons.tests.csproj b/itext.tests/itext.commons.tests/itext.commons.tests.csproj index 46d4f203ad..a516f6e0dc 100644 --- a/itext.tests/itext.commons.tests/itext.commons.tests.csproj +++ b/itext.tests/itext.commons.tests/itext.commons.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461;net45;net40 - + library - + Library NETSTANDARD2_0 @@ -43,7 +43,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.commons.tests/itext/commons/utils/SystemUtilTest.cs b/itext.tests/itext.commons.tests/itext/commons/utils/SystemUtilTest.cs index a9391dc1f2..b7950f21f7 100644 --- a/itext.tests/itext.commons.tests/itext/commons/utils/SystemUtilTest.cs +++ b/itext.tests/itext.commons.tests/itext/commons/utils/SystemUtilTest.cs @@ -143,20 +143,25 @@ public virtual void RunProcessAndWaitWithWorkingDirectoryTest() { if (imageMagickPath == null) { imageMagickPath = SystemUtil.GetEnvironmentVariable(MAGICK_COMPARE_ENVIRONMENT_VARIABLE_LEGACY); } - String inputImage = "image.jpg"; - String cmpImage = "cmp_image.jpg"; - String diff = DESTINATION_FOLDER + "diff_differentImages.png"; - - StringBuilder currCompareParams = new StringBuilder(); - currCompareParams - .Append("'") - .Append(inputImage).Append("' '") - .Append(cmpImage).Append("' '") - .Append(diff).Append("'"); - bool result = SystemUtil.RunProcessAndWait(imageMagickPath, currCompareParams.ToString(), SOURCE_FOLDER); - - NUnit.Framework.Assert.False(result); - NUnit.Framework.Assert.True(FileUtil.FileExists(diff)); + + if (imageMagickPath != null) + { + String inputImage = "image.jpg"; + String cmpImage = "cmp_image.jpg"; + String diff = DESTINATION_FOLDER + "diff_differentImages.png"; + + StringBuilder currCompareParams = new StringBuilder(); + currCompareParams + .Append("'") + .Append(inputImage).Append("' '") + .Append(cmpImage).Append("' '") + .Append(diff).Append("'"); + bool result = + SystemUtil.RunProcessAndWait(imageMagickPath, currCompareParams.ToString(), SOURCE_FOLDER); + + NUnit.Framework.Assert.False(result); + NUnit.Framework.Assert.True(FileUtil.FileExists(diff)); + } } [NUnit.Framework.Test] @@ -166,10 +171,13 @@ public void RunProcessAndGetProcessInfoTest() { imageMagickPath = SystemUtil.GetEnvironmentVariable(MAGICK_COMPARE_ENVIRONMENT_VARIABLE_LEGACY); } - ProcessInfo processInfo = SystemUtil.RunProcessAndGetProcessInfo(imageMagickPath,"--version"); + if (imageMagickPath != null) + { + ProcessInfo processInfo = SystemUtil.RunProcessAndGetProcessInfo(imageMagickPath, "--version"); - NUnit.Framework.Assert.NotNull(processInfo); - NUnit.Framework.Assert.AreEqual(0, processInfo.GetExitCode()); + NUnit.Framework.Assert.NotNull(processInfo); + NUnit.Framework.Assert.AreEqual(0, processInfo.GetExitCode()); + } } } } diff --git a/itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs index 0ef8ac86cf..788ffdf3c9 100644 --- a/itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs @@ -14,9 +14,9 @@ [assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.forms.tests/itext.forms.tests.csproj b/itext.tests/itext.forms.tests/itext.forms.tests.csproj index 355836c6e1..9737a98c37 100644 --- a/itext.tests/itext.forms.tests/itext.forms.tests.csproj +++ b/itext.tests/itext.forms.tests/itext.forms.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -49,7 +49,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs index 468e137506..974b827472 100644 --- a/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.io.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("a53a5dd3-787b-4563-8778-1d76bdad57ba")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.io.tests/itext.io.tests.csproj b/itext.tests/itext.io.tests/itext.io.tests.csproj index 394b247461..3272591e12 100644 --- a/itext.tests/itext.io.tests/itext.io.tests.csproj +++ b/itext.tests/itext.io.tests/itext.io.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -33,7 +33,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -41,7 +41,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.kernel.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.kernel.tests/Properties/AssemblyInfo.cs index 2414edb563..fb30c26ed9 100644 --- a/itext.tests/itext.kernel.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.kernel.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("02e54061-eb72-409d-b2c0-307ce66b57e9")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.kernel.tests/itext.kernel.tests.csproj b/itext.tests/itext.kernel.tests/itext.kernel.tests.csproj index b1aac792d4..ecf23b35f0 100644 --- a/itext.tests/itext.kernel.tests/itext.kernel.tests.csproj +++ b/itext.tests/itext.kernel.tests/itext.kernel.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -46,7 +46,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.layout.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.layout.tests/Properties/AssemblyInfo.cs index 1cb7bfb277..0f8bd4fd2b 100644 --- a/itext.tests/itext.layout.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.layout.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("9ad347a8-ea5b-462b-810c-998f04471bb7")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(600000)] diff --git a/itext.tests/itext.layout.tests/itext.layout.tests.csproj b/itext.tests/itext.layout.tests/itext.layout.tests.csproj index b3b0e034b9..4cc7aa91f9 100644 --- a/itext.tests/itext.layout.tests/itext.layout.tests.csproj +++ b/itext.tests/itext.layout.tests/itext.layout.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -46,7 +46,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.layout.tests/resources/itext/layout/LeadingHeightTest/cmp_pageHeightParagraphWorkAroundTest.pdf b/itext.tests/itext.layout.tests/resources/itext/layout/LeadingHeightTest/cmp_pageHeightParagraphWorkAroundTest.pdf index 90c4bfa70a..e70f24b0c8 100644 Binary files a/itext.tests/itext.layout.tests/resources/itext/layout/LeadingHeightTest/cmp_pageHeightParagraphWorkAroundTest.pdf and b/itext.tests/itext.layout.tests/resources/itext/layout/LeadingHeightTest/cmp_pageHeightParagraphWorkAroundTest.pdf differ diff --git a/itext.tests/itext.pdfa.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.pdfa.tests/Properties/AssemblyInfo.cs index 779f749e53..4c1ff071aa 100644 --- a/itext.tests/itext.pdfa.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.pdfa.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("b7c0e021-71ac-4c97-9a51-8356f1bd53c7")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.pdfa.tests/itext.pdfa.tests.csproj b/itext.tests/itext.pdfa.tests/itext.pdfa.tests.csproj index 84b610b9b9..f23deb1720 100644 --- a/itext.tests/itext.pdfa.tests/itext.pdfa.tests.csproj +++ b/itext.tests/itext.pdfa.tests/itext.pdfa.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -47,7 +47,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.pdftest.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.pdftest.tests/Properties/AssemblyInfo.cs index 040c7b6878..86e78d3352 100644 --- a/itext.tests/itext.pdftest.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.pdftest.tests/Properties/AssemblyInfo.cs @@ -15,6 +15,6 @@ [assembly: Guid("f9880dc4-f015-4413-af86-66d0e9512774")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext.tests/itext.pdftest.tests/itext.pdftest.tests.csproj b/itext.tests/itext.pdftest.tests/itext.pdftest.tests.csproj index 7dc67867a5..91347a504b 100644 --- a/itext.tests/itext.pdftest.tests/itext.pdftest.tests.csproj +++ b/itext.tests/itext.pdftest.tests/itext.pdftest.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -42,7 +42,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.sign.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.sign.tests/Properties/AssemblyInfo.cs index 0a0df7edc2..f814ba7152 100644 --- a/itext.tests/itext.sign.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.sign.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("be15bdf3-b184-4e2f-8459-ebee3160e19d")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.sign.tests/itext.sign.tests.csproj b/itext.tests/itext.sign.tests/itext.sign.tests.csproj index 91e29c9ef9..e2fcc6271d 100644 --- a/itext.tests/itext.sign.tests/itext.sign.tests.csproj +++ b/itext.tests/itext.sign.tests/itext.sign.tests.csproj @@ -5,12 +5,12 @@ 4 - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -28,7 +28,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -47,7 +47,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.styledxmlparser.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.styledxmlparser.tests/Properties/AssemblyInfo.cs index 9db9e21531..35eafc57d5 100644 --- a/itext.tests/itext.styledxmlparser.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.styledxmlparser.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("409b5131-4d0c-4e4b-9c7b-2407a8356ca4")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.styledxmlparser.tests/itext.styledxmlparser.tests.csproj b/itext.tests/itext.styledxmlparser.tests/itext.styledxmlparser.tests.csproj index 04730baae5..b53e00aa8a 100644 --- a/itext.tests/itext.styledxmlparser.tests/itext.styledxmlparser.tests.csproj +++ b/itext.tests/itext.styledxmlparser.tests/itext.styledxmlparser.tests.csproj @@ -5,12 +5,12 @@ - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -38,7 +38,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -48,7 +48,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/css/CssFontFaceRuleTest.cs b/itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/css/CssFontFaceRuleTest.cs index be4e4aedb2..1d37245a68 100644 --- a/itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/css/CssFontFaceRuleTest.cs +++ b/itext.tests/itext.styledxmlparser.tests/itext/styledxmlparser/css/CssFontFaceRuleTest.cs @@ -46,7 +46,7 @@ public virtual void ResolveUnicodeRangeTest() { IList declarations = new List(); declarations.Add(new CssDeclaration("unicode-range", "U+75")); fontFaceRule.AddBodyCssDeclarations(declarations); - Range range = fontFaceRule.ResolveUnicodeRange(); + var range = fontFaceRule.ResolveUnicodeRange(); NUnit.Framework.Assert.IsNotNull(range); NUnit.Framework.Assert.IsTrue(range.Contains(117)); } diff --git a/itext.tests/itext.styledxmlparser.tests/resources/itext/styledxmlparser/jsoup/htmltests/news-com-au-home.html b/itext.tests/itext.styledxmlparser.tests/resources/itext/styledxmlparser/jsoup/htmltests/news-com-au-home.html index 191a7cb198..153d1314cf 100644 --- a/itext.tests/itext.styledxmlparser.tests/resources/itext/styledxmlparser/jsoup/htmltests/news-com-au-home.html +++ b/itext.tests/itext.styledxmlparser.tests/resources/itext/styledxmlparser/jsoup/htmltests/news-com-au-home.html @@ -629,7 +629,7 @@

White Cockatoo

Hot property

-

Australia's unofficial top sex tourist destination now comes with a million-dollar price tag

+

Australia's Net4x. top sex tourist destination now comes with a million-dollar price tag

diff --git a/itext.tests/itext.svg.tests/Properties/AssemblyInfo.cs b/itext.tests/itext.svg.tests/Properties/AssemblyInfo.cs index 7da2287025..f11e654c8e 100644 --- a/itext.tests/itext.svg.tests/Properties/AssemblyInfo.cs +++ b/itext.tests/itext.svg.tests/Properties/AssemblyInfo.cs @@ -15,9 +15,9 @@ [assembly: Guid("ae4e5743-0665-4705-9a33-07ea57cdd269")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] #if !NETSTANDARD2_0 [assembly: NUnit.Framework.Timeout(300000)] diff --git a/itext.tests/itext.svg.tests/itext.svg.tests.csproj b/itext.tests/itext.svg.tests/itext.svg.tests.csproj index bebcf16385..0ed9d97bb0 100644 --- a/itext.tests/itext.svg.tests/itext.svg.tests.csproj +++ b/itext.tests/itext.svg.tests/itext.svg.tests.csproj @@ -5,12 +5,12 @@ - netcoreapp2.0;net461 + netcoreapp3.1;net461 - + library - + Library NETSTANDARD2_0 @@ -39,7 +39,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + @@ -51,7 +51,7 @@ - + 15.0.0 diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillColor.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillColor.pdf index 60cd77341e..adde69ed4a 100644 Binary files a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillColor.pdf and b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillColor.pdf differ diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillStrokeColor.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillStrokeColor.pdf index d7ad7daa42..beff19c7ea 100644 Binary files a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillStrokeColor.pdf and b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgFillStrokeColor.pdf differ diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgSimpleShapesColor.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgSimpleShapesColor.pdf index d62bb7660f..37b8d7def4 100644 Binary files a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgSimpleShapesColor.pdf and b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgSimpleShapesColor.pdf differ diff --git a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgStrokeColor.pdf b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgStrokeColor.pdf index a7625bfe54..d1c48483d3 100644 Binary files a/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgStrokeColor.pdf and b/itext.tests/itext.svg.tests/resources/itext/svg/renderers/impl/DeviceCmykTest/cmp_svgStrokeColor.pdf differ diff --git a/itext/itext.barcodes/Properties/AssemblyInfo.cs b/itext/itext.barcodes/Properties/AssemblyInfo.cs index 64446e2634..c91b5274b1 100644 --- a/itext/itext.barcodes/Properties/AssemblyInfo.cs +++ b/itext/itext.barcodes/Properties/AssemblyInfo.cs @@ -21,6 +21,6 @@ [assembly: Guid("8694665a-5749-40c6-9e9c-53c686a77ad1")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.barcodes/itext.barcodes.csproj b/itext/itext.barcodes/itext.barcodes.csproj index 7af038782d..11ae9f5ac8 100644 --- a/itext/itext.barcodes/itext.barcodes.csproj +++ b/itext/itext.barcodes/itext.barcodes.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -22,7 +22,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.commons/Properties/AssemblyInfo.cs b/itext/itext.commons/Properties/AssemblyInfo.cs index 66fe405556..9cb9b9be97 100644 --- a/itext/itext.commons/Properties/AssemblyInfo.cs +++ b/itext/itext.commons/Properties/AssemblyInfo.cs @@ -39,6 +39,6 @@ [assembly: Guid("339569d2-3ba2-41cc-972c-70b05e4c4fcd")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.commons/itext.commons.csproj b/itext/itext.commons/itext.commons.csproj index 57b2db241f..ec802b169d 100644 --- a/itext/itext.commons/itext.commons.csproj +++ b/itext/itext.commons/itext.commons.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -21,17 +21,29 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 + false + latest - + - + + + + + + + + + + + + - \ No newline at end of file diff --git a/itext/itext.commons/itext/commons/actions/data/CommonsProductData.cs b/itext/itext.commons/itext/commons/actions/data/CommonsProductData.cs index 7ffa19d695..85bae3bf1e 100644 --- a/itext/itext.commons/itext/commons/actions/data/CommonsProductData.cs +++ b/itext/itext.commons/itext/commons/actions/data/CommonsProductData.cs @@ -33,7 +33,7 @@ public sealed class CommonsProductData { internal const String COMMONS_PRODUCT_NAME = "commons"; - internal const String COMMONS_VERSION = "7.2.4"; + internal const String COMMONS_VERSION = "7.2.5"; internal const int COMMONS_COPYRIGHT_SINCE = 2000; diff --git a/itext/itext.commons/itext/commons/utils/JsonUtil.cs b/itext/itext.commons/itext/commons/utils/JsonUtil.cs index 9d5c112325..49bae5442c 100644 --- a/itext/itext.commons/itext/commons/utils/JsonUtil.cs +++ b/itext/itext.commons/itext/commons/utils/JsonUtil.cs @@ -35,6 +35,49 @@ namespace iText.Commons.Utils /// Utility class for JSON serialization and deserialization operations. Not for public use. public sealed class JsonUtil { +#if NET40 + private class Net40StreamWriter : StreamWriter + { + public Net40StreamWriter(Stream stream) : base(stream) + { + } + + public Net40StreamWriter(Stream stream, Encoding encoding) : base(stream, encoding) + { + } + + public Net40StreamWriter(Stream stream, Encoding encoding, int bufferSize) : base(stream, encoding, bufferSize) + { + } + + public Net40StreamWriter(string path) : base(path) + { + } + + public Net40StreamWriter(string path, bool append) : base(path, append) + { + } + + public Net40StreamWriter(string path, bool append, Encoding encoding) : base(path, append, encoding) + { + } + + public Net40StreamWriter(string path, bool append, Encoding encoding, int bufferSize) : base(path, append, encoding, bufferSize) + { + } + + public override void Close() + { + Flush(); + } + + protected override void Dispose(bool disposing) + { + Flush(); + } + } +#endif + private static readonly ILogger LOGGER = ITextLogManager.GetLogger(typeof(JsonUtil)); private JsonUtil() @@ -118,10 +161,13 @@ public static void SerializeToStream(Stream outputStream, Object value) { try { JsonSerializer jsonSerializer = CreateAndConfigureJsonSerializer(); jsonSerializer.Formatting = Formatting.Indented; - +#if NET40 + StreamWriter streamWriter = new Net40StreamWriter(outputStream, new System.Text.UTF8Encoding(), 1024); + streamWriter.NewLine = "\n"; +#else StreamWriter streamWriter = new StreamWriter(outputStream,new System.Text.UTF8Encoding(),1024, true); streamWriter.NewLine = "\n"; - +#endif using (JsonTextWriter jsonTextWriter = new JsonTextWriter(streamWriter)) { jsonTextWriter.Formatting = jsonSerializer.Formatting; @@ -134,15 +180,19 @@ public static void SerializeToStream(Stream outputStream, Object value) { CommonsLogMessageConstant.UNABLE_TO_SERIALIZE_OBJECT, ex.GetType().Name, ex.Message)); } } - + public static void SerializeToMinimalStream(Stream outputStream, Object value) { try { JsonSerializer jsonSerializer = CreateAndConfigureJsonSerializer(); jsonSerializer.Formatting = Formatting.None; - + +#if NET40 + StreamWriter streamWriter = new Net40StreamWriter(outputStream, new System.Text.UTF8Encoding(), 1024); +#else StreamWriter streamWriter = new StreamWriter(outputStream,new System.Text.UTF8Encoding(),1024, true); +#endif streamWriter.NewLine = ""; - using (JsonTextWriter jsonTextWriter = new JsonTextWriter(streamWriter)) { + using (JsonTextWriter jsonTextWriter = new JsonTextWriter(streamWriter)){ jsonTextWriter.Formatting = jsonSerializer.Formatting; jsonSerializer.Serialize(jsonTextWriter, value, null); } diff --git a/itext/itext.commons/itext/commons/utils/SystemUtil.cs b/itext/itext.commons/itext/commons/utils/SystemUtil.cs index 129f81aca2..220342c58e 100644 --- a/itext/itext.commons/itext/commons/utils/SystemUtil.cs +++ b/itext/itext.commons/itext/commons/utils/SystemUtil.cs @@ -165,6 +165,7 @@ internal static void SetProcessStartInfo(Process proc, String exec, String @para internal static String[] PrepareProcessArguments(String exec, String @params) { bool isExcitingFile; + exec ??= string.Empty; try { isExcitingFile = new FileInfo(exec).Exists; diff --git a/itext/itext.commons/itext/commons/utils/ZipFileReader.cs b/itext/itext.commons/itext/commons/utils/ZipFileReader.cs index 589c2095db..d7c4fa218b 100644 --- a/itext/itext.commons/itext/commons/utils/ZipFileReader.cs +++ b/itext/itext.commons/itext/commons/utils/ZipFileReader.cs @@ -24,14 +24,21 @@ You should have received a copy of the GNU Affero General Public License using System.Collections.Generic; using System.IO; using System.IO.Compression; +using System.Linq; using System.Text; using iText.Commons.Exceptions; -namespace iText.Commons.Utils { +#if NET40 +using ZipArchive = Ionic.Zip.ZipFile; +#endif + +namespace iText.Commons.Utils +{ /// Allows reading entries from a zip file. - public class ZipFileReader : IDisposable { - - private readonly ZipArchive zipArchive; + public class ZipFileReader : IDisposable + { + + private ZipArchive zipArchive; /// /// Creates an instance for zip file reading. @@ -40,23 +47,38 @@ public class ZipFileReader : IDisposable { /// if some I/O exception occurs public ZipFileReader(String archivePath) { - if (archivePath == null) { + if (archivePath == null) + { throw new IOException(CommonsExceptionMessageConstant.FILE_NAME_CAN_NOT_BE_NULL); } - +#if NET40 + if (!File.Exists(archivePath)) + { + throw new Exception(); + } + zipArchive = new ZipArchive(archivePath); +#else zipArchive = new ZipArchive(new FileStream(archivePath, FileMode.Open), ZipArchiveMode.Read, false, Encoding.UTF8); +#endif } /// /// Get all file entries paths inside the reading zip file. /// /// the {@link Set} of all file entries paths - public ISet GetFileNames() { + public ISet GetFileNames() + { ISet fileNames = new HashSet(); - foreach (ZipArchiveEntry entry in zipArchive.Entries) { + foreach (var entry in zipArchive.Entries) + { +#if NET40 + String entryName = entry.FileName; +#else String entryName = entry.FullName; - if (!IsDirectory(entryName)) { +#endif + if (!IsDirectory(entryName)) + { fileNames.Add(entryName); } } @@ -69,23 +91,46 @@ public ISet GetFileNames() { /// the file path inside zip to read /// the {@link InputStream} represents read file content /// if some I/O exception occurs - public Stream ReadFromZip(String fileName) { - if (fileName == null) { + public Stream ReadFromZip(String fileName) + { + if (fileName == null) + { throw new IOException(CommonsExceptionMessageConstant.FILE_NAME_CAN_NOT_BE_NULL); } - ZipArchiveEntry entry = zipArchive.GetEntry(fileName); - if (entry == null || IsDirectory(fileName)) { - throw new IOException(MessageFormatUtil.Format( - CommonsExceptionMessageConstant.ZIP_ENTRY_NOT_FOUND, fileName)); - } - return entry.Open(); + if (zipArchive == null) + { + throw new InvalidOperationException(); + } +#if NET40 + var entry = zipArchive.Entries.FirstOrDefault(i => i.FileName == fileName); +#else + var entry = zipArchive.GetEntry(fileName); +#endif + if (entry == null || IsDirectory(fileName)) + { + throw new IOException(MessageFormatUtil.Format( + CommonsExceptionMessageConstant.ZIP_ENTRY_NOT_FOUND, fileName)); + } +#if NET40 + MemoryStream fromZip = new MemoryStream(); + entry.Extract(fromZip); + fromZip.Seek(0, SeekOrigin.Begin); + return fromZip; +#else + return entry.Open(); +#endif } - - public void Dispose() { + + public void Dispose() + { zipArchive.Dispose(); +#if NET40 + zipArchive = null; +#endif } - private static bool IsDirectory(String name) { + private static bool IsDirectory(String name) + { return name.EndsWith("/"); } } diff --git a/itext/itext.commons/itext/commons/utils/ZipFileWriter.cs b/itext/itext.commons/itext/commons/utils/ZipFileWriter.cs index 387294d489..6e4eaeecef 100644 --- a/itext/itext.commons/itext/commons/utils/ZipFileWriter.cs +++ b/itext/itext.commons/itext/commons/utils/ZipFileWriter.cs @@ -27,13 +27,20 @@ You should have received a copy of the GNU Affero General Public License using System.IO.Compression; using System.Text; using iText.Commons.Exceptions; +#if NET40 +using System.Reflection; +using ZipArchive=Ionic.Zip.ZipFile; +#endif namespace iText.Commons.Utils { /// Allows writing entries into a zip file. public class ZipFileWriter : IDisposable { - private readonly ZipArchive outputStream; + private ZipArchive outputStream; private ICollection fileNamesInZip = new HashSet(); +#if NET40 + private string _archivePath; +#endif /// /// Creates an instance for zip file writing. @@ -50,8 +57,17 @@ public ZipFileWriter(String archivePath) { archivePath)); } +#if NET40 + if (!Directory.Exists(Path.GetDirectoryName(Path.GetFullPath(archivePath)))) + { + throw new IOException(); + } + outputStream = new ZipArchive(archivePath); + _archivePath = archivePath; +#else outputStream = new ZipArchive(new FileStream(archivePath, FileMode.Create), ZipArchiveMode.Create, false, Encoding.UTF8); +#endif } /// @@ -103,20 +119,44 @@ public void AddJsonEntry(String fileName, Object objectToAdd) { } public void Dispose() { +#if NET40 + outputStream.Save(_archivePath); +#endif outputStream.Dispose(); +#if NET40 + outputStream = null; +#endif } private void AddEntryToZip(String fileName, Action write) { if (fileName == null || fileNamesInZip.Contains(fileName)) { throw new IOException(CommonsExceptionMessageConstant.FILE_NAME_SHOULD_BE_UNIQUE); } - +#if NET40 + if(outputStream==null) + { + throw new Exception(nameof(outputStream)); + } + var memoryStream = new MemoryStream(); + write.Invoke(memoryStream); + memoryStream.Seek(0, SeekOrigin.Begin); + try + { + outputStream.AddEntry(fileName, memoryStream); + } + catch (ArgumentException e) + { + throw new IOException(e.Message, e); + } + outputStream.Save(_archivePath); +#else ZipArchiveEntry zipEntry = outputStream.CreateEntry(fileName, CompressionLevel.Optimal); // Adding file name right after entry is added. fileNamesInZip.Add(fileName); using (Stream zos = zipEntry.Open()) { write(zos); } +#endif } } } \ No newline at end of file diff --git a/itext/itext.commons/itext7-commons.nuspec b/itext/itext.commons/itext7-commons.nuspec deleted file mode 100644 index 14c89ef5ba..0000000000 --- a/itext/itext.commons/itext7-commons.nuspec +++ /dev/null @@ -1,37 +0,0 @@ - - - - itext7.commons - 7.2.4 - iText 7 commons module - iText Software - iText Software - https://www.gnu.org/licenses/agpl.html - https://itextpdf.com/ - ITSC-avatar.png - true - Commons module - - https://itextpdf.com/itext7release - Copyright (c) 1998-2022 iText Group NV - en-US - itext itext7 itextsharp c# .net csharp - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/itext/itext.font-asian/Properties/AssemblyInfo.cs b/itext/itext.font-asian/Properties/AssemblyInfo.cs index aaf3f49751..44159e026f 100644 --- a/itext/itext.font-asian/Properties/AssemblyInfo.cs +++ b/itext/itext.font-asian/Properties/AssemblyInfo.cs @@ -15,6 +15,6 @@ [assembly: Guid("0f10190c-7611-4378-a157-03bf2ed78e30")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.font-asian/iText Asian Font.nuspec b/itext/itext.font-asian/iText Asian Font.nuspec index 488a62d435..2d50bbaeb3 100644 --- a/itext/itext.font-asian/iText Asian Font.nuspec +++ b/itext/itext.font-asian/iText Asian Font.nuspec @@ -2,7 +2,7 @@ itext7.font-asian - 7.2.4 + 7.2.6 iText 7 Asian Font iText Software iText Software diff --git a/itext/itext.font-asian/itext.font-asian.csproj b/itext/itext.font-asian/itext.font-asian.csproj index a119814d0a..2d49bd94f0 100644 --- a/itext/itext.font-asian/itext.font-asian.csproj +++ b/itext/itext.font-asian/itext.font-asian.csproj @@ -8,7 +8,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library diff --git a/itext/itext.forms/Properties/AssemblyInfo.cs b/itext/itext.forms/Properties/AssemblyInfo.cs index 5de3092679..0f55053dab 100644 --- a/itext/itext.forms/Properties/AssemblyInfo.cs +++ b/itext/itext.forms/Properties/AssemblyInfo.cs @@ -20,6 +20,6 @@ [assembly: Guid("2257d7e6-2873-4cfb-ac3c-b24765a4b3b1")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.forms/itext.forms.csproj b/itext/itext.forms/itext.forms.csproj index 256b493233..b0b8ff56e6 100644 --- a/itext/itext.forms/itext.forms.csproj +++ b/itext/itext.forms/itext.forms.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -19,7 +19,7 @@ itext.forms - + diff --git a/itext/itext.hyph/Properties/AssemblyInfo.cs b/itext/itext.hyph/Properties/AssemblyInfo.cs index 7abbd12f3b..6ee2e018bc 100644 --- a/itext/itext.hyph/Properties/AssemblyInfo.cs +++ b/itext/itext.hyph/Properties/AssemblyInfo.cs @@ -15,6 +15,6 @@ [assembly: Guid("56137079-541a-425a-ab97-43af63793c97")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.hyph/iText Hyph.nuspec b/itext/itext.hyph/iText Hyph.nuspec index 1f18ee3bf3..7068246fd8 100644 --- a/itext/itext.hyph/iText Hyph.nuspec +++ b/itext/itext.hyph/iText Hyph.nuspec @@ -2,7 +2,7 @@ itext7.hyph - 7.2.4 + 7.2.6 iText 7 Hyph iText Software iText Software diff --git a/itext/itext.hyph/itext.hyph.csproj b/itext/itext.hyph/itext.hyph.csproj index 7817573320..e27a6aba1e 100644 --- a/itext/itext.hyph/itext.hyph.csproj +++ b/itext/itext.hyph/itext.hyph.csproj @@ -7,7 +7,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library diff --git a/itext/itext.io/Properties/AssemblyInfo.cs b/itext/itext.io/Properties/AssemblyInfo.cs index 9f20aa5529..fb2cc47999 100644 --- a/itext/itext.io/Properties/AssemblyInfo.cs +++ b/itext/itext.io/Properties/AssemblyInfo.cs @@ -35,6 +35,6 @@ [assembly: Guid("39631ecb-1d39-4eb2-b775-37bd34cbf5a4")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.io/itext.io.csproj b/itext/itext.io/itext.io.csproj index c3e103ad29..62d61fd340 100644 --- a/itext/itext.io/itext.io.csproj +++ b/itext/itext.io/itext.io.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -73,7 +73,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.io/itext/io/codec/Jbig2SegmentReader.cs b/itext/itext.io/itext/io/codec/Jbig2SegmentReader.cs index b4200459a8..af6e82d4a2 100644 --- a/itext/itext.io/itext/io/codec/Jbig2SegmentReader.cs +++ b/itext/itext.io/itext/io/codec/Jbig2SegmentReader.cs @@ -325,7 +325,7 @@ internal virtual Jbig2SegmentReader.Jbig2Segment ReadHeader() { bool page_association_size = (segment_header_flags & 0x40) == 0x40; int segment_type = segment_header_flags & 0x3f; s.type = segment_type; - //7.2.4 + //7.2.5 int referred_to_byte0 = ra.Read(); int count_of_referred_to_segments = (referred_to_byte0 & 0xE0) >> 5; int[] referred_to_segment_numbers = null; diff --git a/itext/itext.io/itext/io/source/GroupedRandomAccessSource.cs b/itext/itext.io/itext/io/source/GroupedRandomAccessSource.cs index 3c36fc98c5..c5e93221a3 100644 --- a/itext/itext.io/itext/io/source/GroupedRandomAccessSource.cs +++ b/itext/itext.io/itext/io/source/GroupedRandomAccessSource.cs @@ -208,12 +208,20 @@ public virtual void Close() { } else { ILogger logger = ITextLogManager.GetLogger(typeof(iText.IO.Source.GroupedRandomAccessSource)); +#if NET45 + logger.LogError(0, ex, iText.IO.Logs.IoLogMessageConstant.ONE_OF_GROUPED_SOURCES_CLOSING_FAILED); +#else logger.LogError(ex, iText.IO.Logs.IoLogMessageConstant.ONE_OF_GROUPED_SOURCES_CLOSING_FAILED); +#endif } } catch (Exception ex) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.IO.Source.GroupedRandomAccessSource)); +#if NET45 + logger.LogError(0, ex, iText.IO.Logs.IoLogMessageConstant.ONE_OF_GROUPED_SOURCES_CLOSING_FAILED); +#else logger.LogError(ex, iText.IO.Logs.IoLogMessageConstant.ONE_OF_GROUPED_SOURCES_CLOSING_FAILED); +#endif } } if (firstThrownIOExc != null) { diff --git a/itext/itext.kernel/Properties/AssemblyInfo.cs b/itext/itext.kernel/Properties/AssemblyInfo.cs index a916450ac3..b87d1bb522 100644 --- a/itext/itext.kernel/Properties/AssemblyInfo.cs +++ b/itext/itext.kernel/Properties/AssemblyInfo.cs @@ -21,6 +21,6 @@ [assembly: Guid("be4c62cc-6495-47e1-ab00-05b1bfe331f6")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.kernel/itext.kernel.csproj b/itext/itext.kernel/itext.kernel.csproj index 2ba391e8a7..aa283a50ce 100644 --- a/itext/itext.kernel/itext.kernel.csproj +++ b/itext/itext.kernel/itext.kernel.csproj @@ -9,7 +9,7 @@ PORTABLE;NEW_REFLECTION - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -36,7 +36,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.kernel/itext/kernel/actions/data/ITextCoreProductData.cs b/itext/itext.kernel/itext/kernel/actions/data/ITextCoreProductData.cs index 71110808c2..f698c5de34 100644 --- a/itext/itext.kernel/itext/kernel/actions/data/ITextCoreProductData.cs +++ b/itext/itext.kernel/itext/kernel/actions/data/ITextCoreProductData.cs @@ -33,7 +33,7 @@ namespace iText.Kernel.Actions.Data { public sealed class ITextCoreProductData { private const String CORE_PUBLIC_PRODUCT_NAME = "Core"; - private const String CORE_VERSION = "7.2.4"; + private const String CORE_VERSION = "7.2.5"; private const int CORE_COPYRIGHT_SINCE = 2000; diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs b/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs index 52f322ef5e..96eac88986 100644 --- a/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs +++ b/itext/itext.kernel/itext/kernel/pdf/PdfDocument.cs @@ -906,7 +906,11 @@ public virtual void Close() { } catch (Exception e) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Kernel.Pdf.PdfDocument)); +#if NET45 + logger.LogError(0, e, iText.IO.Logs.IoLogMessageConstant.PDF_WRITER_CLOSING_FAILED); +#else logger.LogError(e, iText.IO.Logs.IoLogMessageConstant.PDF_WRITER_CLOSING_FAILED); +#endif } } if (reader != null && IsCloseReader()) { @@ -915,7 +919,11 @@ public virtual void Close() { } catch (Exception e) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Kernel.Pdf.PdfDocument)); +#if NET45 + logger.LogError(0, e, iText.IO.Logs.IoLogMessageConstant.PDF_READER_CLOSING_FAILED); +#else logger.LogError(e, iText.IO.Logs.IoLogMessageConstant.PDF_READER_CLOSING_FAILED); +#endif } } } @@ -1856,7 +1864,11 @@ public virtual PdfFont GetDefaultFont() { } catch (System.IO.IOException e) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Kernel.Pdf.PdfDocument)); +#if NET45 + logger.LogError(0, e, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_CREATING_DEFAULT_FONT); +#else logger.LogError(e, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_CREATING_DEFAULT_FONT); +#endif defaultFont = null; } } @@ -2228,7 +2240,11 @@ protected internal virtual void UpdateXmpMetadata() { } catch (XMPException e) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Kernel.Pdf.PdfDocument)); +#if NET45 + logger.LogError(0, e, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_UPDATING_XMPMETADATA); +#else logger.LogError(e, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_UPDATING_XMPMETADATA); +#endif } } @@ -2345,7 +2361,11 @@ protected internal virtual void TryInitTagStructure(PdfDictionary str) { structTreeRoot = null; structParentIndex = -1; ILogger logger = ITextLogManager.GetLogger(typeof(iText.Kernel.Pdf.PdfDocument)); +#if NET45 + logger.LogError(0, ex, iText.IO.Logs.IoLogMessageConstant.TAG_STRUCTURE_INIT_FAILED); +#else logger.LogError(ex, iText.IO.Logs.IoLogMessageConstant.TAG_STRUCTURE_INIT_FAILED); +#endif } } diff --git a/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs b/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs index 55a37920f4..b52b35c843 100644 --- a/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs +++ b/itext/itext.kernel/itext/kernel/pdf/PdfReader.cs @@ -807,7 +807,11 @@ protected internal virtual void ReadPdf() { catch (Exception ex) { if (PdfReader.StrictnessLevel.CONSERVATIVE.IsStricter(this.GetStrictnessLevel())) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Kernel.Pdf.PdfReader)); +#if NET45 + logger.LogError(0, ex, iText.IO.Logs.IoLogMessageConstant.XREF_ERROR_WHILE_READING_TABLE_WILL_BE_REBUILT); +#else logger.LogError(ex, iText.IO.Logs.IoLogMessageConstant.XREF_ERROR_WHILE_READING_TABLE_WILL_BE_REBUILT); +#endif RebuildXref(); } else { diff --git a/itext/itext.kernel/itext/kernel/xmp/impl/ParseRdf.cs b/itext/itext.kernel/itext/kernel/xmp/impl/ParseRdf.cs index 9cc11d8491..dc2e85c286 100644 --- a/itext/itext.kernel/itext/kernel/xmp/impl/ParseRdf.cs +++ b/itext/itext.kernel/itext/kernel/xmp/impl/ParseRdf.cs @@ -1108,7 +1108,7 @@ private static bool IsPropertyElementName(int term) } /// - /// 7.2.4 oldTerms
+ /// 7.2.5 oldTerms
/// rdf:aboutEach | rdf:aboutEachPrefix | rdf:bagID /// /// the term id diff --git a/itext/itext.layout/Properties/AssemblyInfo.cs b/itext/itext.layout/Properties/AssemblyInfo.cs index e30f18cb9a..19db47a2a5 100644 --- a/itext/itext.layout/Properties/AssemblyInfo.cs +++ b/itext/itext.layout/Properties/AssemblyInfo.cs @@ -24,6 +24,6 @@ [assembly: TypographyVersion("3.0.1.0")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.layout/itext.layout.csproj b/itext/itext.layout/itext.layout.csproj index 2cf4f98c9e..140a8b36fe 100644 --- a/itext/itext.layout/itext.layout.csproj +++ b/itext/itext.layout/itext.layout.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -22,7 +22,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.pdfa/Properties/AssemblyInfo.cs b/itext/itext.pdfa/Properties/AssemblyInfo.cs index b378f2a81a..b18c0d0a1d 100644 --- a/itext/itext.pdfa/Properties/AssemblyInfo.cs +++ b/itext/itext.pdfa/Properties/AssemblyInfo.cs @@ -21,6 +21,6 @@ [assembly: Guid("9fc2f0b3-a8d2-46da-8724-72e00e67a8fa")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.pdfa/itext.pdfa.csproj b/itext/itext.pdfa/itext.pdfa.csproj index 555252a2c2..3ed4860cb7 100644 --- a/itext/itext.pdfa/itext.pdfa.csproj +++ b/itext/itext.pdfa/itext.pdfa.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -22,7 +22,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.pdfa/itext/pdfa/PdfADocument.cs b/itext/itext.pdfa/itext/pdfa/PdfADocument.cs index 360847c37c..29cab96c1c 100644 --- a/itext/itext.pdfa/itext/pdfa/PdfADocument.cs +++ b/itext/itext.pdfa/itext/pdfa/PdfADocument.cs @@ -286,7 +286,11 @@ protected override void AddCustomMetadataExtensions(XMPMeta xmpMeta) { } catch (XMPException exc) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Pdfa.PdfADocument)); +#if NET45 + logger.LogError(0, exc, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_UPDATING_XMPMETADATA); +#else logger.LogError(exc, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_UPDATING_XMPMETADATA); +#endif } } } @@ -306,7 +310,11 @@ protected override void UpdateXmpMetadata() { } catch (XMPException e) { ILogger logger = ITextLogManager.GetLogger(typeof(iText.Pdfa.PdfADocument)); +#if NET45 + logger.LogError(0, e, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_UPDATING_XMPMETADATA); +#else logger.LogError(e, iText.IO.Logs.IoLogMessageConstant.EXCEPTION_WHILE_UPDATING_XMPMETADATA); +#endif } } diff --git a/itext/itext.pdftest/Properties/AssemblyInfo.cs b/itext/itext.pdftest/Properties/AssemblyInfo.cs index 10d86d422b..6d7d7e55d9 100644 --- a/itext/itext.pdftest/Properties/AssemblyInfo.cs +++ b/itext/itext.pdftest/Properties/AssemblyInfo.cs @@ -20,6 +20,6 @@ [assembly: Guid("f9880dc4-f015-4413-af86-66d0e9512774")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.pdftest/itext.pdftest.csproj b/itext/itext.pdftest/itext.pdftest.csproj index 570bbbbbbb..78092c9495 100644 --- a/itext/itext.pdftest/itext.pdftest.csproj +++ b/itext/itext.pdftest/itext.pdftest.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -38,7 +38,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.pdftest/itext7-pdftest.nuspec b/itext/itext.pdftest/itext7-pdftest.nuspec index 316ef06ccb..454ddfff69 100644 --- a/itext/itext.pdftest/itext7-pdftest.nuspec +++ b/itext/itext.pdftest/itext7-pdftest.nuspec @@ -2,7 +2,7 @@ itext7.pdftest - 7.2.4 + 7.2.6 iText 7 pdftest module iText Software iText Software diff --git a/itext/itext.sign/Properties/AssemblyInfo.cs b/itext/itext.sign/Properties/AssemblyInfo.cs index 997d428d4a..5f6068a0dc 100644 --- a/itext/itext.sign/Properties/AssemblyInfo.cs +++ b/itext/itext.sign/Properties/AssemblyInfo.cs @@ -21,6 +21,6 @@ [assembly: Guid("5092244a-a2ed-49d2-97fb-f513d965a8f7")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.sign/itext.sign.csproj b/itext/itext.sign/itext.sign.csproj index c58ce788fe..94ba2515b1 100644 --- a/itext/itext.sign/itext.sign.csproj +++ b/itext/itext.sign/itext.sign.csproj @@ -6,7 +6,7 @@ 4 - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -35,7 +35,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.sign/itext/signatures/CertificateVerification.cs b/itext/itext.sign/itext/signatures/CertificateVerification.cs index 19dd449315..1803436dfe 100644 --- a/itext/itext.sign/itext/signatures/CertificateVerification.cs +++ b/itext/itext.sign/itext/signatures/CertificateVerification.cs @@ -260,7 +260,11 @@ public static bool VerifyTimestampCertificates(TimeStampToken ts, List exceptionsThrown) { foreach (Exception ex in exceptionsThrown) { +#if NET45 + LOGGER.LogError(0, ex, ex.Message == null ? SignLogMessageConstant.EXCEPTION_WITHOUT_MESSAGE : ex.Message); +#else LOGGER.LogError(ex, ex.Message == null ? SignLogMessageConstant.EXCEPTION_WITHOUT_MESSAGE : ex.Message); +#endif } } } diff --git a/itext/itext.styledxmlparser/Properties/AssemblyInfo.cs b/itext/itext.styledxmlparser/Properties/AssemblyInfo.cs index 0e990625aa..cf3f64dcc9 100644 --- a/itext/itext.styledxmlparser/Properties/AssemblyInfo.cs +++ b/itext/itext.styledxmlparser/Properties/AssemblyInfo.cs @@ -21,6 +21,6 @@ [assembly: Guid("8636f290-00df-403e-b841-e4bfd6d9ce7a")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.styledxmlparser/itext.styledxmlparser.csproj b/itext/itext.styledxmlparser/itext.styledxmlparser.csproj index 03db54b362..17a860eca7 100644 --- a/itext/itext.styledxmlparser/itext.styledxmlparser.csproj +++ b/itext/itext.styledxmlparser/itext.styledxmlparser.csproj @@ -6,7 +6,7 @@ $(TargetDir)bin\$(Configuration)\$(TargetFramework)\itext.styledxmlparser.xml - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -22,7 +22,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.styledxmlparser/itext/styledxmlparser/css/parse/CssRuleSetParser.cs b/itext/itext.styledxmlparser/itext/styledxmlparser/css/parse/CssRuleSetParser.cs index e6ec7cf026..b84fd0558a 100644 --- a/itext/itext.styledxmlparser/itext/styledxmlparser/css/parse/CssRuleSetParser.cs +++ b/itext/itext.styledxmlparser/itext/styledxmlparser/css/parse/CssRuleSetParser.cs @@ -143,8 +143,13 @@ public static IList ParseRuleSet(String selectorStr, String properti ruleSets.Add(new CssRuleSet(new CssSelector(currentSelectorStr), declarations)); } catch (Exception exc) { +#if NET45 + logger.LogError(0, exc, MessageFormatUtil.Format(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant + .ERROR_PARSING_CSS_SELECTOR, currentSelectorStr)); +#else logger.LogError(exc, MessageFormatUtil.Format(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant .ERROR_PARSING_CSS_SELECTOR, currentSelectorStr)); +#endif //if any separated selector has errors, all others become invalid. //in this case we just clear map, it is the easies way to support this. declarations.Clear(); diff --git a/itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs b/itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs index 0991a39a40..2744ac2e6f 100644 --- a/itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs +++ b/itext/itext.styledxmlparser/itext/styledxmlparser/resolver/resource/ResourceResolver.cs @@ -210,8 +210,13 @@ public virtual byte[] RetrieveBytesFromResource(String src) { return retriever.GetByteArrayByUrl(url); } catch (Exception e) { +#if NET45 + logger.LogError(0, e, MessageFormatUtil.Format(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI + , uriResolver.GetBaseUri(), src)); +#else logger.LogError(e, MessageFormatUtil.Format(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI , uriResolver.GetBaseUri(), src)); +#endif return null; } } @@ -229,8 +234,13 @@ public virtual Stream RetrieveResourceAsInputStream(String src) { return retriever.GetInputStreamByUrl(url); } catch (Exception e) { +#if NET45 + logger.LogError(0, e, MessageFormatUtil.Format(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI + , uriResolver.GetBaseUri(), src)); +#else logger.LogError(e, MessageFormatUtil.Format(iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RETRIEVE_STREAM_WITH_GIVEN_BASE_URI , uriResolver.GetBaseUri(), src)); +#endif return null; } } diff --git a/itext/itext.svg/Properties/AssemblyInfo.cs b/itext/itext.svg/Properties/AssemblyInfo.cs index 7faedfd2f4..619c16f4d4 100644 --- a/itext/itext.svg/Properties/AssemblyInfo.cs +++ b/itext/itext.svg/Properties/AssemblyInfo.cs @@ -21,6 +21,6 @@ [assembly: Guid("ff6ba09d-3655-466a-8c17-a7bfd3479ca1")] -[assembly: AssemblyVersion("7.2.4.0")] -[assembly: AssemblyFileVersion("7.2.4.0")] -[assembly: AssemblyInformationalVersion("7.2.4")] +[assembly: AssemblyVersion("7.2.5.0")] +[assembly: AssemblyFileVersion("7.2.5.0")] +[assembly: AssemblyInformationalVersion("7.2.5")] diff --git a/itext/itext.svg/itext.svg.csproj b/itext/itext.svg/itext.svg.csproj index d40dd5be33..0b5b54864d 100644 --- a/itext/itext.svg/itext.svg.csproj +++ b/itext/itext.svg/itext.svg.csproj @@ -6,7 +6,7 @@ $(TargetDir)bin\$(Configuration)\$(TargetFramework)\itext.svg.xml - netstandard2.0;net461 + netstandard2.0;net461;net45;net40 library @@ -22,7 +22,7 @@ 1701;1702;1591;1570;1572;1573;1574;1580;1584;1658 - + diff --git a/itext/itext.svg/itext/svg/css/impl/SvgStyleResolver.cs b/itext/itext.svg/itext/svg/css/impl/SvgStyleResolver.cs index 291f3c186b..1c6a1bb936 100644 --- a/itext/itext.svg/itext/svg/css/impl/SvgStyleResolver.cs +++ b/itext/itext.svg/itext/svg/css/impl/SvgStyleResolver.cs @@ -119,7 +119,11 @@ public SvgStyleResolver(SvgProcessorContext context) { } } catch (System.IO.IOException e) { +#if NET45 + LOGGER.LogWarning(0, e, SvgLogMessageConstant.ERROR_INITIALIZING_DEFAULT_CSS); +#else LOGGER.LogWarning(e, SvgLogMessageConstant.ERROR_INITIALIZING_DEFAULT_CSS); +#endif this.css = new CssStyleSheet(); } this.resourceResolver = context.GetResourceResolver(); @@ -287,8 +291,13 @@ private void ProcessXLink(IAttribute attr, IDictionary attribute xlinkValue = this.resourceResolver.ResolveAgainstBaseUri(attr.GetValue()).ToExternalForm(); } catch (UriFormatException mue) { - LOGGER.LogError(mue, iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RESOLVE_IMAGE_URL +#if NET45 + LOGGER.LogError(0, mue, iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RESOLVE_IMAGE_URL ); +#else + LOGGER.LogError(mue, iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_RESOLVE_IMAGE_URL + ); +#endif } } attributesMap.Put(attr.GetKey(), xlinkValue); @@ -341,8 +350,13 @@ private void CollectCssDeclarations(INode rootNode, ResourceResolver resourceRes } } catch (Exception exc) { +#if NET45 + LOGGER.LogError(0, exc, iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE + ); +#else LOGGER.LogError(exc, iText.StyledXmlParser.Logs.StyledXmlParserLogMessageConstant.UNABLE_TO_PROCESS_EXTERNAL_CSS_FILE ); +#endif } } } diff --git a/itext/itext.svg/itext/svg/renderers/impl/UseSvgNodeRenderer.cs b/itext/itext.svg/itext/svg/renderers/impl/UseSvgNodeRenderer.cs index 258a993eca..25ae94fe77 100644 --- a/itext/itext.svg/itext/svg/renderers/impl/UseSvgNodeRenderer.cs +++ b/itext/itext.svg/itext/svg/renderers/impl/UseSvgNodeRenderer.cs @@ -92,8 +92,13 @@ protected internal override void DoDraw(SvgDrawContext context) { inverseMatrix = translation.CreateInverse(); } catch (NoninvertibleTransformException ex) { - ITextLogManager.GetLogger(typeof(UseSvgNodeRenderer)).LogWarning(ex, SvgLogMessageConstant.NONINVERTIBLE_TRANSFORMATION_MATRIX_USED_IN_CLIP_PATH +#if NET45 + ITextLogManager.GetLogger(typeof(UseSvgNodeRenderer)).LogWarning(0, ex, SvgLogMessageConstant.NONINVERTIBLE_TRANSFORMATION_MATRIX_USED_IN_CLIP_PATH ); +#else + ITextLogManager.GetLogger(typeof(UseSvgNodeRenderer)).LogWarning(ex, SvgLogMessageConstant.NONINVERTIBLE_TRANSFORMATION_MATRIX_USED_IN_CLIP_PATH + ); +#endif } } } diff --git a/itext7.nuspec b/itext7.nuspec deleted file mode 100644 index a4995d1d62..0000000000 --- a/itext7.nuspec +++ /dev/null @@ -1,87 +0,0 @@ - - - - itext7 - 7.2.4 - iText 7 Community - iText Software - iText Software - https://www.gnu.org/licenses/agpl.html - https://itextpdf.com/ - ITSC-avatar.png - true - iText 7 represents the next level of SDKs for developers that want to take advantage of the benefits PDF can bring. Equipped with a better document engine, high- and low-level programming capabilities and the ability to create, edit and enhance PDF documents, iText 7 can be a boon to nearly every workflow. iText 7 allows you to build custom PDF scenarios for web, mobile, desktop or cloud apps in .NET. - iText for .NET is a library for PDF generation written entirely in C# for the .NET platform. - https://itextpdf.com/itext7release - Copyright (c) 1998-2022 iText Group NV - en-US - itext itext7 itextsharp c# .net csharp pdf itextcore core fdf xfa acroform forms svg digital-signatures signing security accessibility opensource open source - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file