Skip to content

Commit 03020c7

Browse files
iText-CIiText-CI
committed
[RELEASE] iText 7 7.2.4
2 parents 0ba81c9 + b7fdecb commit 03020c7

File tree

1,194 files changed

+59209
-13378
lines changed

Some content is hidden

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

1,194 files changed

+59209
-13378
lines changed

‎Jenkinsfile‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
def repoName = "itextcore"
55
def dependencyRegex = ""
6-
def solutionFile = "iTextCore.netstandard.sln"
7-
def csprojFramework = "netcoreapp2.0"
6+
def solutionFile = "iTextCore.sln"
7+
def frameworksToTest = "net461;netcoreapp2.0"
88

9-
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, csprojFramework)
9+
automaticDotnetBuild(repoName, dependencyRegex, solutionFile, frameworksToTest)

‎doxyfile‎

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

35-
PROJECT_NAME = "iText 7 7.2.3 API"
35+
PROJECT_NAME = "iText 7 7.2.4 API"
3636

3737
# The PROJECT_NUMBER tag can be used to enter a project or revision number. This
3838
# could be handy for archiving the generated documentation or if some version

‎iTextCore.netstandard.sln‎

Lines changed: 0 additions & 359 deletions
This file was deleted.

‎iTextCore.sln‎

Lines changed: 319 additions & 117 deletions
Large diffs are not rendered by default.

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

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

17-
[assembly: AssemblyVersion("7.2.3.0")]
18-
[assembly: AssemblyFileVersion("7.2.3.0")]
19-
[assembly: AssemblyInformationalVersion("7.2.3")]
17+
[assembly: AssemblyVersion("7.2.4.0")]
18+
[assembly: AssemblyFileVersion("7.2.4.0")]
19+
[assembly: AssemblyInformationalVersion("7.2.4")]
2020

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

‎itext.tests/itext.barcodes.tests/itext.barcodes.tests.csproj‎

Lines changed: 39 additions & 126 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,56 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0" DefaultTargets="Build">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
2+
<PropertyGroup Label="Configuration">
3+
<SignAssembly>True</SignAssembly>
4+
<DelaySign>False</DelaySign>
5+
<WarningLevel>4</WarningLevel>
6+
</PropertyGroup>
47
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{D015A3AA-613C-45D9-B908-7D47C4B613AF}</ProjectGuid>
8+
<TargetFrameworks>netcoreapp2.0;net461</TargetFrameworks>
9+
</PropertyGroup>
10+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
11+
<OutputType>library</OutputType>
12+
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
814
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
10-
<AssemblyName>itext.barcodes.tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<TargetFrameworkProfile />
14-
<ProductVersion>8.0.30703</ProductVersion>
15-
<SchemaVersion>2.0</SchemaVersion>
16-
<SignAssembly>true</SignAssembly>
15+
<DefineConstants>NETSTANDARD2_0</DefineConstants>
16+
</PropertyGroup>
17+
<PropertyGroup>
1718
<AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
1819
</PropertyGroup>
19-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
20-
<DebugSymbols>true</DebugSymbols>
21-
<DebugType>full</DebugType>
22-
<Optimize>false</Optimize>
23-
<OutputPath>bin\Debug\</OutputPath>
24-
<DefineConstants>DEBUG;TRACE</DefineConstants>
25-
<ErrorReport>prompt</ErrorReport>
26-
<WarningLevel>4</WarningLevel>
27-
<NoWarn>CS1591;CS1570;CS1572;CS1573;CS1574;CS1580;CS1584;CS1658</NoWarn>
20+
<PropertyGroup>
21+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
22+
<ApplicationIcon />
23+
<OutputTypeEx>library</OutputTypeEx>
24+
<StartupObject />
25+
<AssemblyName>itext.barcodes.tests</AssemblyName>
26+
<RootNamespace />
2827
</PropertyGroup>
29-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
30-
<DebugType>pdbonly</DebugType>
31-
<Optimize>true</Optimize>
32-
<OutputPath>bin\Release\</OutputPath>
33-
<DefineConstants>TRACE</DefineConstants>
34-
<ErrorReport>prompt</ErrorReport>
35-
<WarningLevel>4</WarningLevel>
36-
<NoWarn>CS1591;CS1570;CS1572;CS1573;CS1574;CS1580;CS1584;CS1658</NoWarn>
28+
<PropertyGroup>
29+
<NoWarn>1701;1702;1591;1570;1572;1573;1574;1580;1584;1658</NoWarn>
3730
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
40-
<HintPath>$(SolutionDir)\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="Microsoft.Extensions.DependencyInjection, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
44-
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.DependencyInjection.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
48-
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.DependencyInjection.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="Microsoft.Extensions.Logging, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
52-
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Logging.5.0.0\lib\net461\Microsoft.Extensions.Logging.dll</HintPath>
53-
<Private>True</Private>
54-
</Reference>
55-
<Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
56-
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Logging.Abstractions.5.0.0\lib\net461\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
57-
<Private>True</Private>
58-
</Reference>
59-
<Reference Include="Microsoft.Extensions.Options, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
60-
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Options.5.0.0\lib\net461\Microsoft.Extensions.Options.dll</HintPath>
61-
<Private>True</Private>
62-
</Reference>
63-
<Reference Include="Microsoft.Extensions.Primitives, Version=5.0.0.0, Culture=neutral, PublicKeyToken=adb9793829ddae60">
64-
<HintPath>$(SolutionDir)\packages\Microsoft.Extensions.Primitives.5.0.0\lib\net461\Microsoft.Extensions.Primitives.dll</HintPath>
65-
<Private>True</Private>
66-
</Reference>
67-
<Reference Include="mscorlib" />
68-
<Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
69-
<HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
70-
</Reference>
31+
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
7132
<Reference Include="System" />
72-
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
73-
<HintPath>$(SolutionDir)\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
74-
<Private>True</Private>
75-
</Reference>
7633
<Reference Include="System.Core" />
77-
<Reference Include="System.Diagnostics.DiagnosticSource, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
78-
<HintPath>$(SolutionDir)\packages\System.Diagnostics.DiagnosticSource.5.0.0\lib\net46\System.Diagnostics.DiagnosticSource.dll</HintPath>
79-
<Private>True</Private>
80-
</Reference>
81-
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
82-
<HintPath>$(SolutionDir)\packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
83-
<Private>True</Private>
84-
</Reference>
85-
<Reference Include="System.Numerics" />
86-
<Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
87-
<HintPath>$(SolutionDir)\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
88-
<Private>True</Private>
89-
</Reference>
90-
<Reference Include="System.Runtime.CompilerServices.Unsafe, Version=5.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
91-
<HintPath>$(SolutionDir)\packages\System.Runtime.CompilerServices.Unsafe.5.0.0\lib\net45\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
92-
<Private>True</Private>
93-
</Reference>
94-
<Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
95-
<HintPath>$(SolutionDir)\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
96-
<Private>True</Private>
97-
</Reference>
98-
<Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51">
99-
<HintPath>$(SolutionDir)\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
100-
<Private>True</Private>
101-
</Reference>
10234
</ItemGroup>
10335
<ItemGroup>
104-
<Compile Include="itext\barcodes\**\*.cs" />
105-
<Compile Include="Properties\AssemblyInfo.cs" />
36+
<PackageReference Include="TeamCity.VSTest.TestAdapter" Version="1.0.0" />
37+
<PackageReference Include="NUnit" Version="3.7.1" />
38+
<PackageReference Include="NUnit3TestAdapter" Version="3.10.0" />
10639
</ItemGroup>
10740
<ItemGroup>
108-
<ProjectReference Include="..\..\itext\itext.barcodes\itext.barcodes.csproj">
109-
<Project>{DCAE8241-E391-418D-BA36-C7C064D7C413}</Project>
110-
<Name>itext.barcodes</Name>
111-
</ProjectReference>
112-
<ProjectReference Include="..\..\itext\itext.io\itext.io.csproj">
113-
<Project>{CEE5E7E1-1BF0-4BE1-9941-903262CE2F83}</Project>
114-
<Name>itext.io</Name>
115-
</ProjectReference>
116-
<ProjectReference Include="..\..\itext\itext.commons\itext.commons.csproj">
117-
<Project>{339569D2-3BA2-41CC-972C-70B05E4C4FCD}</Project>
118-
<Name>itext.commons</Name>
119-
</ProjectReference>
120-
<ProjectReference Include="..\..\itext\itext.kernel\itext.kernel.csproj">
121-
<Project>{4E7819E8-7555-4E2E-9A01-D8718A2CFDDA}</Project>
122-
<Name>itext.kernel</Name>
123-
</ProjectReference>
124-
<ProjectReference Include="..\..\itext\itext.pdftest\itext.pdftest.csproj">
125-
<Project>{F9880DC4-F015-4413-AF86-66D0E9512774}</Project>
126-
<Name>itext.pdftest</Name>
127-
</ProjectReference>
41+
<ProjectReference Include="..\..\itext\itext.barcodes\itext.barcodes.csproj" />
42+
<ProjectReference Include="..\..\itext\itext.io\itext.io.csproj" />
43+
<ProjectReference Include="..\..\itext\itext.kernel\itext.kernel.csproj" />
44+
<ProjectReference Include="..\..\itext\itext.pdftest\itext.pdftest.csproj" />
12845
</ItemGroup>
129-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
130-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
131-
Other similar extension points exist, see Microsoft.Common.targets.
132-
<Target Name="BeforeBuild">
133-
</Target>
134-
<Target Name="AfterBuild">
135-
</Target>
136-
-->
13746
<ItemGroup>
138-
<None Include="packages.config" />
13947
</ItemGroup>
140-
<ItemGroup>
141-
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
48+
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
49+
<PackageReference Include="Microsoft.NET.Test.Sdk">
50+
<Version>15.0.0</Version>
51+
</PackageReference>
52+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
53+
<Version>4.3.0</Version>
54+
</PackageReference>
14255
</ItemGroup>
14356
</Project>

‎itext.tests/itext.barcodes.tests/itext.barcodes.tests.netstandard.csproj‎

Lines changed: 0 additions & 56 deletions
This file was deleted.

‎itext.tests/itext.barcodes.tests/itext/barcodes/Barcode128Test.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ source product.
4848
using iText.Test;
4949

5050
namespace iText.Barcodes {
51+
[NUnit.Framework.Category("Integration test")]
5152
public class Barcode128Test : ExtendedITextTest {
5253
public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
5354
.CurrentContext.TestDirectory) + "/resources/itext/barcodes/";

‎itext.tests/itext.barcodes.tests/itext/barcodes/Barcode39Test.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ source product.
4949
using iText.Test;
5050

5151
namespace iText.Barcodes {
52+
[NUnit.Framework.Category("Integration test")]
5253
public class Barcode39Test : ExtendedITextTest {
5354
public static readonly String sourceFolder = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
5455
.CurrentContext.TestDirectory) + "/resources/itext/barcodes/";

‎itext.tests/itext.barcodes.tests/itext/barcodes/BarcodeCodabarTest.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ source product.
4949
using iText.Test;
5050

5151
namespace iText.Barcodes {
52+
[NUnit.Framework.Category("Integration test")]
5253
public class BarcodeCodabarTest : ExtendedITextTest {
5354
private static readonly String SOURCE_FOLDER = iText.Test.TestUtil.GetParentProjectDirectory(NUnit.Framework.TestContext
5455
.CurrentContext.TestDirectory) + "/resources/itext/barcodes/";

0 commit comments

Comments
 (0)