Skip to content

Commit b509bb4

Browse files
xrkolovosxrkolovos
committed
Update Packages to build with net5.0
1 parent a6d1309 commit b509bb4

40 files changed

+83
-84
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
[assembly: AssemblyFileVersion("7.1.15.0")]
1919
[assembly: AssemblyInformationalVersion("7.1.15-SNAPSHOT")]
2020

21-
#if !NETSTANDARD2_0
21+
#if !NETSTANDARD2_0 && !NET5_0
2222
[assembly: NUnit.Framework.Timeout(300000)]
2323
#endif

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<PropertyGroup Label="Configuration">
33
<SignAssembly>True</SignAssembly>
44
<DelaySign>False</DelaySign>
55
<WarningLevel>4</WarningLevel>
66
</PropertyGroup>
77
<PropertyGroup>
8-
<TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
8+
<TargetFrameworks>net5.0;netcoreapp2.0;net40</TargetFrameworks>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
1111
<OutputType>library</OutputType>
1212
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
14+
<OutputType>library</OutputType>
15+
</PropertyGroup>
1316
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
1417
<OutputType>Library</OutputType>
1518
<DefineConstants>NETSTANDARD2_0</DefineConstants>
@@ -45,12 +48,8 @@
4548
</ItemGroup>
4649
<ItemGroup>
4750
</ItemGroup>
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>
51+
<ItemGroup Condition="'$(TargetFramework)' != 'net40'">
52+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
53+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
5554
</ItemGroup>
5655
</Project>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@
1818
[assembly: AssemblyFileVersion("7.1.15.0")]
1919
[assembly: AssemblyInformationalVersion("7.1.15-SNAPSHOT")]
2020

21-
#if !NETSTANDARD2_0
21+
#if !NETSTANDARD2_0 && !NET5_0
2222
[assembly: NUnit.Framework.Timeout(300000)]
2323
#endif

‎itext.tests/itext.forms.tests/itext.forms.tests.netstandard.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,14 @@
55
<WarningLevel>4</WarningLevel>
66
</PropertyGroup>
77
<PropertyGroup>
8-
<TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
8+
<TargetFrameworks>net5.0;netcoreapp2.0;net40</TargetFrameworks>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
1111
<OutputType>library</OutputType>
1212
</PropertyGroup>
13+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
14+
<OutputType>library</OutputType>
15+
</PropertyGroup>
1316
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
1417
<OutputType>Library</OutputType>
1518
<DefineConstants>NETSTANDARD2_0</DefineConstants>
@@ -49,12 +52,8 @@
4952
</ItemGroup>
5053
<ItemGroup>
5154
</ItemGroup>
52-
<ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.0'">
53-
<PackageReference Include="Microsoft.NET.Test.Sdk">
54-
<Version>15.0.0</Version>
55-
</PackageReference>
56-
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation">
57-
<Version>4.3.0</Version>
58-
</PackageReference>
59-
</ItemGroup>
55+
<ItemGroup Condition="'$(TargetFramework)' != 'net40'">
56+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
57+
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
58+
</ItemGroup>
6059
</Project>

‎itext.tests/itext.forms.tests/itext/forms/FlatteningWithNullKidElementTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ OF THIRD PARTY RIGHTS
1616
or FITNESS FOR A PARTICULAR PURPOSE.
1717
See the GNU Affero General Public License for more details.
1818
You should have received a copy of the GNU Affero General Public License
19-
along with this program; if not, see http://www.gnu.org/licenses or write to
19+
along with this program; if not, see http://www.gnu.org/licenses or write tod
2020
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
2121
Boston, MA, 02110-1301 USA, or download the license from the following URL:
2222
http://itextpdf.com/terms-of-use/

‎itext.tests/itext.forms.tests/itext/forms/xfa/XXEVulnerabilityTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public virtual void XfaExternalFileTest() {
6666
String outFileName = destinationFolder + "outXfaExternalFile.pdf";
6767
String cmpFileName = sourceFolder + "cmp_outXfaExternalFile.pdf";
6868

69-
#if NETSTANDARD2_0
69+
#if NETSTANDARD2_0 || NET5_0
7070
using (PdfDocument pdfDoc = new PdfDocument(new PdfReader(inFileName), new PdfWriter(outFileName).SetCompressionLevel
7171
(CompressionConstants.NO_COMPRESSION))) {
7272
NUnit.Framework.Assert.That(() =>
@@ -98,7 +98,7 @@ public virtual void XfaExternalConnectionTest() {
9898
String outFileName = destinationFolder + "outXfaExternalConnection.pdf";
9999
String cmpFileName = sourceFolder + "cmp_outXfaExternalConnection.pdf";
100100

101-
#if NETSTANDARD2_0
101+
#if NETSTANDARD2_0 || NET5_0
102102
using (PdfDocument pdfDoc = new PdfDocument(new PdfReader(inFileName), new PdfWriter(outFileName).SetCompressionLevel
103103
(CompressionConstants.NO_COMPRESSION))) {
104104
NUnit.Framework.Assert.That(() =>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
[assembly: AssemblyFileVersion("7.1.15.0")]
2020
[assembly: AssemblyInformationalVersion("7.1.15-SNAPSHOT")]
2121

22-
#if !NETSTANDARD2_0
22+
#if !NETSTANDARD2_0 && !NET5_0
2323
[assembly: NUnit.Framework.Timeout(300000)]
2424
#endif

‎itext.tests/itext.kernel.tests/itext.kernel.tests.netstandard.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
1+
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="15.0">
22
<PropertyGroup Label="Configuration">
33
<SignAssembly>True</SignAssembly>
44
<DelaySign>False</DelaySign>
55
<WarningLevel>4</WarningLevel>
66
</PropertyGroup>
77
<PropertyGroup>
8-
<TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
8+
<TargetFrameworks>net5.0;netcoreapp2.0;net40</TargetFrameworks>
99
</PropertyGroup>
1010
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
1111
<OutputType>library</OutputType>

‎itext.tests/itext.kernel.tests/itext/kernel/pdf/PdfReaderTest.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,7 +1193,7 @@ public virtual void IncorrectXrefSizeInTrailerAppend() {
11931193
document.Close();
11941194
}
11951195

1196-
#if !NETSTANDARD2_0
1196+
#if !NETSTANDARD2_0 && !NET5_0 && !NET5_0
11971197
[NUnit.Framework.Timeout(1000)]
11981198
#endif // !NETSTANDARD2_0
11991199
[NUnit.Framework.Test]
@@ -1213,7 +1213,7 @@ public virtual void StreamLengthCorrection1() {
12131213
}
12141214
}
12151215

1216-
#if !NETSTANDARD2_0
1216+
#if !NETSTANDARD2_0 && !NET5_0
12171217
[NUnit.Framework.Timeout(1000)]
12181218
#endif // !NETSTANDARD2_0
12191219
[NUnit.Framework.Test]
@@ -1230,7 +1230,7 @@ public virtual void StreamLengthCorrection2() {
12301230
}
12311231
}
12321232

1233-
#if !NETSTANDARD2_0
1233+
#if !NETSTANDARD2_0 && !NET5_0
12341234
[NUnit.Framework.Timeout(1000)]
12351235
#endif // !NETSTANDARD2_0
12361236
[NUnit.Framework.Test]
@@ -1247,7 +1247,7 @@ public virtual void StreamLengthCorrection3() {
12471247
}
12481248
}
12491249

1250-
#if !NETSTANDARD2_0
1250+
#if !NETSTANDARD2_0 && !NET5_0
12511251
[NUnit.Framework.Timeout(1000)]
12521252
#endif // !NETSTANDARD2_0
12531253
[NUnit.Framework.Test]
@@ -1264,7 +1264,7 @@ public virtual void StreamLengthCorrection4() {
12641264
}
12651265
}
12661266

1267-
#if !NETSTANDARD2_0
1267+
#if !NETSTANDARD2_0 && !NET5_0
12681268
[NUnit.Framework.Timeout(1000)]
12691269
#endif // !NETSTANDARD2_0
12701270
[NUnit.Framework.Test]
@@ -1281,7 +1281,7 @@ public virtual void StreamLengthCorrection5() {
12811281
}
12821282
}
12831283

1284-
#if !NETSTANDARD2_0
1284+
#if !NETSTANDARD2_0 && !NET5_0
12851285
[NUnit.Framework.Timeout(1000)]
12861286
#endif // !NETSTANDARD2_0
12871287
[NUnit.Framework.Test]
@@ -1298,7 +1298,7 @@ public virtual void StreamLengthCorrection6() {
12981298
}
12991299
}
13001300

1301-
#if !NETSTANDARD2_0
1301+
#if !NETSTANDARD2_0 && !NET5_0
13021302
[NUnit.Framework.Timeout(1000)]
13031303
#endif // !NETSTANDARD2_0
13041304
[NUnit.Framework.Test]
@@ -1315,7 +1315,7 @@ public virtual void StreamLengthCorrection7() {
13151315
}
13161316
}
13171317

1318-
#if !NETSTANDARD2_0
1318+
#if !NETSTANDARD2_0 && !NET5_0
13191319
[NUnit.Framework.Timeout(1000)]
13201320
#endif // !NETSTANDARD2_0
13211321
[NUnit.Framework.Test]
@@ -1332,7 +1332,7 @@ public virtual void StreamLengthCorrection8() {
13321332
}
13331333
}
13341334

1335-
#if !NETSTANDARD2_0
1335+
#if !NETSTANDARD2_0 && !NET5_0
13361336
[NUnit.Framework.Timeout(1000)]
13371337
#endif // !NETSTANDARD2_0
13381338
[NUnit.Framework.Test]

‎itext.tests/itext.kernel.tests/itext/kernel/pdf/xobject/ImageFromLanguageStandardLibraryTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ source product.
4242
*/
4343

4444
// System.Drawing doesn't exist within .netcoreapp
45-
#if !NETSTANDARD2_0
45+
#if !NETSTANDARD2_0 && !NET5_0
4646

4747
using iText.Kernel.Font;
4848
using iText.Kernel.Pdf.Canvas;

0 commit comments

Comments
 (0)