Skip to content

Commit

Permalink
Merge branch 'develop' into devsecops
Browse files Browse the repository at this point in the history
  • Loading branch information
aleks-ivanov committed Nov 16, 2024
2 parents a5e77ae + d515302 commit 9cb8468
Show file tree
Hide file tree
Showing 39 changed files with 102 additions and 102 deletions.
6 changes: 3 additions & 3 deletions itext.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>itext</id>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>
<title>iText Community</title>
<authors>Apryse Software</authors>
<owners>Apryse Software</owners>
Expand All @@ -19,11 +19,11 @@
<repository type="git" url="https://github.com/itext/itext7-dotnet.git" />
<dependencies>
<group targetFramework="net461">
<dependency id="itext.commons" version="9.0.1-SNAPSHOT" />
<dependency id="itext.commons" version="9.1.0-SNAPSHOT" />
<dependency id="Microsoft.Extensions.Logging" version="5.0.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="itext.commons" version="9.0.1-SNAPSHOT" />
<dependency id="itext.commons" version="9.1.0-SNAPSHOT" />
<dependency id="Microsoft.Extensions.Logging" version="5.0.0" />
<dependency id="System.Diagnostics.Process" version="4.3.0" />
<dependency id="System.Globalization.Extensions" version="4.3.0" />
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.barcodes.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

[assembly: Guid("d015a3aa-613c-45d9-b908-7d47c4b613af")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.commons.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("502eda37-c014-4822-8e5c-4e5d21b085e9")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.forms.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@

[assembly: Guid("6fe2f714-6b3e-4b20-8c70-28bfce084ed2")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.io.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("a53a5dd3-787b-4563-8778-1d76bdad57ba")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.kernel.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("02e54061-eb72-409d-b2c0-307ce66b57e9")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.layout.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("9ad347a8-ea5b-462b-810c-998f04471bb7")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(600000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.pdfa.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("b7c0e021-71ac-4c97-9a51-8356f1bd53c7")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.pdftest.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("f9880dc4-f015-4413-af86-66d0e9512774")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
6 changes: 3 additions & 3 deletions itext.tests/itext.pdfua.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("f542854e-7f6b-4207-b6ca-004a5d266e65")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.sign.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("be15bdf3-b184-4e2f-8459-ebee3160e19d")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

[assembly: Guid("409b5131-4d0c-4e4b-9c7b-2407a8356ca4")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext.tests/itext.svg.tests/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@

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

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]

#if !NETSTANDARD2_0
[assembly: NUnit.Framework.Timeout(300000)]
Expand Down
6 changes: 3 additions & 3 deletions itext/itext.barcodes/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

[assembly: Guid("8694665a-5749-40c6-9e9c-53c686a77ad1")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
6 changes: 3 additions & 3 deletions itext/itext.bouncy-castle-adapter/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("3c83a192-e64a-4134-ade9-38f65c8e9fca")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>itext.bouncy-castle-adapter</id>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>
<title>iText bouncy-castle adapter module</title>
<authors>Apryse Software</authors>
<owners>Apryse Software</owners>
Expand All @@ -18,11 +18,11 @@
<tags>itext itext7 itextsharp c# .net csharp</tags>
<dependencies>
<group targetFramework="net461">
<dependency id="itext.commons" version="9.0.1-SNAPSHOT" />
<dependency id="itext.commons" version="9.1.0-SNAPSHOT" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="itext.commons" version="9.0.1-SNAPSHOT" />
<dependency id="itext.commons" version="9.1.0-SNAPSHOT" />
<dependency id="BouncyCastle.Cryptography" version="2.4.0" />
</group>
</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("56eaf103-2032-43eb-a7dd-fbeea5c5cb9c")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("4e9a859e-f268-49cc-ac3c-c5b9632b3290")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>itext.bouncy-castle-fips-adapter</id>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>
<title>iText bouncy-castle FIPS adapter module</title>
<authors>Apryse Software</authors>
<owners>Apryse Software</owners>
Expand All @@ -18,7 +18,7 @@
<tags>itext itext7 itextsharp c# .net csharp</tags>
<dependencies>
<group targetFramework="netstandard2.0">
<dependency id="itext.commons" version="9.0.1-SNAPSHOT" />
<dependency id="itext.commons" version="9.1.0-SNAPSHOT" />
</group>
</dependencies>
</metadata>
Expand Down
6 changes: 3 additions & 3 deletions itext/itext.commons/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,6 @@

[assembly: Guid("339569d2-3ba2-41cc-972c-70b05e4c4fcd")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
2 changes: 1 addition & 1 deletion itext/itext.commons/itext-commons.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>itext.commons</id>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>
<title>iText commons module</title>
<authors>Apryse Software</authors>
<owners>Apryse Software</owners>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ public sealed class CommonsProductData {
//\endcond

//\cond DO_NOT_DOCUMENT
internal const String COMMONS_VERSION = "9.0.1-SNAPSHOT";
internal const String COMMONS_VERSION = "9.1.0-SNAPSHOT";
//\endcond

//\cond DO_NOT_DOCUMENT
Expand Down
6 changes: 3 additions & 3 deletions itext/itext.font-asian/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("0f10190c-7611-4378-a157-03bf2ed78e30")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
2 changes: 1 addition & 1 deletion itext/itext.font-asian/iText Asian Font.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>itext.font-asian</id>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>
<title>iText Asian Font</title>
<authors>Apryse Software</authors>
<owners>Apryse Software</owners>
Expand Down
6 changes: 3 additions & 3 deletions itext/itext.forms/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@

[assembly: Guid("2257d7e6-2873-4cfb-ac3c-b24765a4b3b1")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
6 changes: 3 additions & 3 deletions itext/itext.hyph/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@

[assembly: Guid("56137079-541a-425a-ab97-43af63793c97")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
2 changes: 1 addition & 1 deletion itext/itext.hyph/iText Hyph.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
<metadata>
<id>itext.hyph</id>
<version>9.0.1-SNAPSHOT</version>
<version>9.1.0-SNAPSHOT</version>
<title>iText Hyph</title>
<authors>Apryse Software</authors>
<owners>Apryse Software</owners>
Expand Down
6 changes: 3 additions & 3 deletions itext/itext.io/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,6 @@

[assembly: Guid("39631ecb-1d39-4eb2-b775-37bd34cbf5a4")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
6 changes: 3 additions & 3 deletions itext/itext.kernel/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

[assembly: Guid("be4c62cc-6495-47e1-ab00-05b1bfe331f6")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
Original file line number Diff line number Diff line change
Expand Up @@ -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 = "9.0.1-SNAPSHOT";
private const String CORE_VERSION = "9.1.0-SNAPSHOT";

private const int CORE_COPYRIGHT_SINCE = 2000;

Expand Down
6 changes: 3 additions & 3 deletions itext/itext.layout/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@

[assembly: TypographyVersion("5.0.1.0")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
6 changes: 3 additions & 3 deletions itext/itext.pdfa/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@

[assembly: Guid("9fc2f0b3-a8d2-46da-8724-72e00e67a8fa")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
6 changes: 3 additions & 3 deletions itext/itext.pdftest/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@

[assembly: Guid("f9880dc4-f015-4413-af86-66d0e9512774")]

[assembly: AssemblyVersion("9.0.1.0")]
[assembly: AssemblyFileVersion("9.0.1.0")]
[assembly: AssemblyInformationalVersion("9.0.1-SNAPSHOT")]
[assembly: AssemblyVersion("9.1.0.0")]
[assembly: AssemblyFileVersion("9.1.0.0")]
[assembly: AssemblyInformationalVersion("9.1.0-SNAPSHOT")]
Loading

0 comments on commit 9cb8468

Please sign in to comment.