Skip to content

Commit 89e2590

Browse files
EvgenyB1001iText-CI
EvgenyB1001
authored and
iText-CI
committed
Drop .NET Framework 4.0 support in favor of 4.5 in html2pdf modules
DEVSIX-5153
1 parent c93c196 commit 89e2590

File tree

7 files changed

+31
-31
lines changed

7 files changed

+31
-31
lines changed

‎itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.csproj‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AppDesignerFolder>Properties</AppDesignerFolder>
1111
<RootNamespace />
1212
<AssemblyName>itext.html2pdf.tests</AssemblyName>
13-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
13+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1414
<FileAlignment>512</FileAlignment>
1515
<SignAssembly>true</SignAssembly>
1616
<AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
@@ -36,7 +36,7 @@
3636
</PropertyGroup>
3737
<ItemGroup>
3838
<Reference Include="nunit.framework, Version=3.7.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
39-
<HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net40\nunit.framework.dll</HintPath>
39+
<HintPath>$(SolutionDir)\packages\NUnit.3.7.1\lib\net45\nunit.framework.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="System" />
@@ -52,21 +52,21 @@
5252
<Name>itext.forms</Name>
5353
</ProjectReference>
5454
<Reference Include="itext.forms, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')">
55-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.forms.dll</HintPath>
55+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.forms.dll</HintPath>
5656
</Reference>
5757
<ProjectReference Include="..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
5858
<Project>{56137079-541A-425A-AB97-43AF63793C97}</Project>
5959
<Name>itext.hyph</Name>
6060
</ProjectReference>
6161
<Reference Include="itext.hyph, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.hyph\itext.hyph.csproj')">
62-
<HintPath>$(SolutionDir)\packages\itext7.hyph.7.1.15-SNAPSHOT\lib\net40\itext.hyph.dll</HintPath>
62+
<HintPath>$(SolutionDir)\packages\itext7.hyph.7.1.15-SNAPSHOT\lib\net45\itext.hyph.dll</HintPath>
6363
</Reference>
6464
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
6565
<Project>{cee5e7e1-1bf0-4be1-9941-903262ce2f83}</Project>
6666
<Name>itext.io</Name>
6767
</ProjectReference>
6868
<Reference Include="itext.io, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
69-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.io.dll</HintPath>
69+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.io.dll</HintPath>
7070
</Reference>
7171
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
7272
<Project>{4e7819e8-7555-4e2e-9a01-d8718a2cfdda}</Project>
@@ -76,42 +76,42 @@
7676
<HintPath>$(SolutionDir)\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
7777
</Reference>
7878
<Reference Include="itext.kernel, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
79-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.kernel.dll</HintPath>
79+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.kernel.dll</HintPath>
8080
</Reference>
8181
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
8282
<Project>{42173642-db52-44d3-9883-3e34c65c53bc}</Project>
8383
<Name>itext.layout</Name>
8484
</ProjectReference>
8585
<Reference Include="itext.layout, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
86-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.layout.dll</HintPath>
86+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.layout.dll</HintPath>
8787
</Reference>
8888
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
8989
<Project>{9fc2f0b3-a8d2-46da-8724-72e00e67a8fa}</Project>
9090
<Name>itext.pdfa</Name>
9191
</ProjectReference>
9292
<Reference Include="itext.pdfa, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdfa\itext.pdfa.csproj')">
93-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.pdfa.dll</HintPath>
93+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.pdfa.dll</HintPath>
9494
</Reference>
9595
<ProjectReference Include="..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
9696
<Project>{f9880dc4-f015-4413-af86-66d0e9512774}</Project>
9797
<Name>itext.pdftest</Name>
9898
</ProjectReference>
9999
<Reference Include="itext.pdftest, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.pdftest\itext.pdftest.csproj')">
100-
<HintPath>$(SolutionDir)\packages\itext7.pdftest.7.1.15-SNAPSHOT\lib\net40\itext.pdftest.dll</HintPath>
100+
<HintPath>$(SolutionDir)\packages\itext7.pdftest.7.1.15-SNAPSHOT\lib\net45\itext.pdftest.dll</HintPath>
101101
</Reference>
102102
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
103103
<Project>{8636f290-00df-403e-b841-e4bfd6d9ce7a}</Project>
104104
<Name>itext.styledxmlparser</Name>
105105
</ProjectReference>
106106
<Reference Include="itext.styledxmlparser, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
107-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.styledxmlparser.dll</HintPath>
107+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.styledxmlparser.dll</HintPath>
108108
</Reference>
109109
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
110110
<Project>{ddec35d2-5781-471d-5ea1-a6e433eddb11}</Project>
111111
<Name>itext.svg</Name>
112112
</ProjectReference>
113113
<Reference Include="itext.svg, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
114-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.svg.dll</HintPath>
114+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.svg.dll</HintPath>
115115
</Reference>
116116
<ProjectReference Include="..\..\itext\itext.html2pdf\itext.html2pdf.csproj">
117117
<Project>{ff6ba09d-3655-466a-8c17-a7bfd3479ca1}</Project>

‎itext.tests/itext.html2pdf.tests/itext.html2pdf.tests.netstandard.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
<RootNamespace />
77
</PropertyGroup>
88
<PropertyGroup>
9-
<TargetFrameworks>netcoreapp2.0;net40</TargetFrameworks>
9+
<TargetFrameworks>netcoreapp2.0;net45</TargetFrameworks>
1010
</PropertyGroup>
11-
<PropertyGroup Condition=" '$(TargetFramework)' == 'net40' ">
11+
<PropertyGroup Condition=" '$(TargetFramework)' == 'net45' ">
1212
<OutputType>library</OutputType>
1313
</PropertyGroup>
1414
<PropertyGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
@@ -38,7 +38,7 @@
3838
<PropertyGroup>
3939
<NoWarn>1701;1702;1591;1570;1572;1573;1574;1580;1584;1658</NoWarn>
4040
</PropertyGroup>
41-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
41+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
4242
<Reference Include="System" />
4343
<Reference Include="System.Core" />
4444
</ItemGroup>

‎itext.tests/itext.html2pdf.tests/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="NUnit" version="3.7.1" targetFramework="net4" />
4-
<package id="itext7.pdftest" version="7.1.15-SNAPSHOT" targetFramework="net40" />
5-
<package id="itext7" version="7.1.15-SNAPSHOT" targetFramework="net40" />
6-
<package id="itext7.hyph" version="7.1.15-SNAPSHOT" targetFramework="net40" />
3+
<package id="NUnit" version="3.7.1" targetFramework="net45" />
4+
<package id="itext7.pdftest" version="7.1.15-SNAPSHOT" targetFramework="net45" />
5+
<package id="itext7" version="7.1.15-SNAPSHOT" targetFramework="net45" />
6+
<package id="itext7.hyph" version="7.1.15-SNAPSHOT" targetFramework="net45" />
77
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net40" />
88
</packages>

‎itext/itext.html2pdf/itext.html2pdf.csproj‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace />
1111
<AssemblyName>itext.html2pdf</AssemblyName>
12-
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<SignAssembly>true</SignAssembly>
1515
<AssemblyOriginatorKeyFile>itext.snk</AssemblyOriginatorKeyFile>
@@ -58,14 +58,14 @@
5858
<Name>itext.forms</Name>
5959
</ProjectReference>
6060
<Reference Include="itext.forms, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.forms\itext.forms.csproj')">
61-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.forms.dll</HintPath>
61+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.forms.dll</HintPath>
6262
</Reference>
6363
<ProjectReference Include="..\..\..\itextcore\itext\itext.io\itext.io.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
6464
<Project>{cee5e7e1-1bf0-4be1-9941-903262ce2f83}</Project>
6565
<Name>itext.io</Name>
6666
</ProjectReference>
6767
<Reference Include="itext.io, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.io\itext.io.csproj')">
68-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.io.dll</HintPath>
68+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.io.dll</HintPath>
6969
</Reference>
7070
<ProjectReference Include="..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
7171
<Project>{4e7819e8-7555-4e2e-9a01-d8718a2cfdda}</Project>
@@ -75,28 +75,28 @@
7575
<HintPath>$(SolutionDir)\packages\Portable.BouncyCastle.1.8.9\lib\net40\BouncyCastle.Crypto.dll</HintPath>
7676
</Reference>
7777
<Reference Include="itext.kernel, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.kernel\itext.kernel.csproj')">
78-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.kernel.dll</HintPath>
78+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.kernel.dll</HintPath>
7979
</Reference>
8080
<ProjectReference Include="..\..\..\itextcore\itext\itext.layout\itext.layout.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
8181
<Project>{42173642-db52-44d3-9883-3e34c65c53bc}</Project>
8282
<Name>itext.layout</Name>
8383
</ProjectReference>
8484
<Reference Include="itext.layout, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.layout\itext.layout.csproj')">
85-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.layout.dll</HintPath>
85+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.layout.dll</HintPath>
8686
</Reference>
8787
<ProjectReference Include="..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
8888
<Project>{8636f290-00df-403e-b841-e4bfd6d9ce7a}</Project>
8989
<Name>itext.styledxmlparser</Name>
9090
</ProjectReference>
9191
<Reference Include="itext.styledxmlparser, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.styledxmlparser\itext.styledxmlparser.csproj')">
92-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.styledxmlparser.dll</HintPath>
92+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.styledxmlparser.dll</HintPath>
9393
</Reference>
9494
<ProjectReference Include="..\..\..\itextcore\itext\itext.svg\itext.svg.csproj" Condition="Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
9595
<Project>{ddec35d2-5781-471d-5ea1-a6e433eddb11}</Project>
9696
<Name>itext.svg</Name>
9797
</ProjectReference>
9898
<Reference Include="itext.svg, Version=7.1.15.0, Culture=neutral, PublicKeyToken=8354ae6d2174ddca" Condition="!Exists('..\..\..\itextcore\itext\itext.svg\itext.svg.csproj')">
99-
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net40\itext.svg.dll</HintPath>
99+
<HintPath>$(SolutionDir)\packages\itext7.7.1.15-SNAPSHOT\lib\net45\itext.svg.dll</HintPath>
100100
</Reference>
101101
</ItemGroup>
102102
<ItemGroup>

‎itext/itext.html2pdf/itext.html2pdf.netstandard.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<DocumentationFile>$(TargetDir)bin\$(Configuration)\$(TargetFramework)\itext.html2pdf.xml</DocumentationFile>
88
</PropertyGroup>
99
<PropertyGroup>
10-
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
10+
<TargetFrameworks>netstandard2.0;net45</TargetFrameworks>
1111
</PropertyGroup>
1212
<PropertyGroup>
1313
<OutputType>library</OutputType>
@@ -23,7 +23,7 @@
2323
<PropertyGroup>
2424
<NoWarn>1701;1702;1591;1570;1572;1573;1574;1580;1584;1658</NoWarn>
2525
</PropertyGroup>
26-
<ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
26+
<ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
2727
<Reference Include="System" />
2828
<Reference Include="System.Core" />
2929
<Reference Include="System.Xml.Linq" />

‎itext/itext.html2pdf/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,6 @@
22
<packages>
33
<package id="Common.Logging" version="3.4.1" targetFramework="net40" />
44
<package id="Common.Logging.Core" version="3.4.1" targetFramework="net40" />
5-
<package id="itext7" version="7.1.15-SNAPSHOT" targetFramework="net40" />
5+
<package id="itext7" version="7.1.15-SNAPSHOT" targetFramework="net45" />
66
<package id="Portable.BouncyCastle" version="1.8.9" targetFramework="net40" />
77
</packages>

‎pdfHTML.nuspec‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<tags>itext itext7 itextsharp c# .net csharp pdf html pdfhtml htmltopdf html2pdf html-to-pdf html-to-pdf-converter svg acroform pdf-generation generation converter accessbility opensource open source</tags>
1919
<repository type="git" url="https://github.com/itext/i7n-pdfhtml.git" />
2020
<dependencies>
21-
<group targetFramework="net40">
21+
<group targetFramework="net45">
2222
<dependency id="itext7" version="7.1.15-SNAPSHOT" />
2323
<dependency id="Common.Logging" version="3.4.1" />
2424
</group>
@@ -29,8 +29,8 @@
2929
</dependencies>
3030
</metadata>
3131
<files>
32-
<file src="itext\itext.html2pdf\bin\Release\net40\itext.html2pdf.dll" target="lib\net40" />
33-
<file src="itext\itext.html2pdf\bin\Release\net40\itext.html2pdf.xml" target="lib\net40" />
32+
<file src="itext\itext.html2pdf\bin\Release\net45\itext.html2pdf.dll" target="lib\net45" />
33+
<file src="itext\itext.html2pdf\bin\Release\net45\itext.html2pdf.xml" target="lib\net45" />
3434
<file src="itext\itext.html2pdf\bin\Release\netstandard2.0\itext.html2pdf.dll" target="lib\netstandard2.0" />
3535
<file src="itext\itext.html2pdf\bin\Release\netstandard2.0\itext.html2pdf.xml" target="lib\netstandard2.0" />
3636
<file src="gnu-agpl-v3.0.md" target="" />

0 commit comments

Comments
 (0)