Skip to content

Commit c0c2f41

Browse files
eXpl0it3reXpl0it3r
committed
Update to .NET Framewok 4.6.2
- Older .NET Framework versions are no longer supported - Update project format to SDK style
1 parent bbff890 commit c0c2f41

File tree

15 files changed

+98
-795
lines changed

15 files changed

+98
-795
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ x64/
3636
*.vspscc
3737
*.vssscc
3838
.builds
39+
.vs/
3940

4041
# Visual C++ cache files
4142
ipch/

‎Build/NuGet/HtmlRenderer.Mono.nuspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* Support separating CSS from HTML by loading stylesheet code separately.
2828
* Support text selection, copy-paste and context menu.
2929
* Handles "real world" malformed HTML, it doesn't have to be XHTML.
30-
* Supports .NET 2.0 or higher including Client Profile.
3130
* Lightweight, only two DLLs (~300K).
3231
* High performance and low memory footprint.
3332
* Extendable and configurable.

‎Build/NuGet/HtmlRenderer.PdfSharp.nuspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
* Extensive HTML 4.01 and CSS level 2 specifications support.
2323
* Support separating CSS from HTML by loading stylesheet code separately.
2424
* Handles "real world" malformed HTML, it doesn't have to be XHTML.
25-
* Supports .NET 2.0 or higher including Client Profile.
2625
* Lightweight, only two DLLs (~300K).
2726
* High performance and low memory footprint.
2827
* Extendable and configurable.

‎Build/NuGet/HtmlRenderer.WinForms.nuspec‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
* Support separating CSS from HTML by loading stylesheet code separately.
2828
* Support text selection, copy-paste and context menu.
2929
* Handles "real world" malformed HTML, it doesn't have to be XHTML.
30-
* Supports .NET 2.0 or higher including Client Profile.
3130
* Lightweight, only two DLLs (~300K).
3231
* High performance and low memory footprint.
3332
* Extendable and configurable.

‎README.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
**Cross framework** (WinForms/WPF/PDF/Metro/Mono/etc.), **Multipurpose** (UI Controls / Image generation / PDF generation / etc.), **100% managed** (C#), High performance HTML Rendering library.
44

5-
The library is 100% managed **C#** code without any external dependencies (no WebBrowser control, ActiveX / COM or MSHTML dll), the only requirement is **.NET 2.0 or higher**.
5+
The library is 100% managed **C#** code without any external dependencies (no WebBrowser control, ActiveX / COM or MSHTML dll), the only requirement is **.NET Framework 4.6.2 or higher**.
66

77
![Renderer.png](https://raw.githubusercontent.com/ArthurHub/HTML-Renderer/master/Art/demo_winforms.png)
88

@@ -38,7 +38,6 @@ The latest NuGet packages can be found on NuGet.org:
3838
* Create images/PDFs from HTML snippets.
3939
* Handles "real world" malformed HTML, it doesn't have to be XHTML.
4040
* 100% managed code and no external dependencies.
41-
* Supports .NET 2.0 or higher including Client Profile.
4241
* Lightweight, just two DLLs (~300K).
4342
* High performance and low memory footprint.
4443
* Extendable and configurable.

‎Source/Demo/Common/HtmlRenderer.Demo.Common.csproj‎

Lines changed: 50 additions & 132 deletions
Original file line numberDiff line numberDiff line change
@@ -1,178 +1,96 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{2390B71F-9400-47F4-B23A-7F2649C87D35}</ProjectGuid>
3+
<TargetFramework>net462</TargetFramework>
84
<OutputType>Library</OutputType>
9-
<AppDesignerFolder>Properties</AppDesignerFolder>
105
<RootNamespace>TheArtOfDev.HtmlRenderer.Demo.Common</RootNamespace>
116
<AssemblyName>HtmlRendererDemoCommon</AssemblyName>
12-
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
13-
<FileAlignment>512</FileAlignment>
14-
<TargetFrameworkProfile />
7+
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
158
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<DebugSymbols>true</DebugSymbols>
18-
<DebugType>full</DebugType>
19-
<Optimize>false</Optimize>
20-
<OutputPath>bin\Debug\</OutputPath>
21-
<DefineConstants>DEBUG;TRACE</DefineConstants>
22-
<ErrorReport>prompt</ErrorReport>
23-
<WarningLevel>4</WarningLevel>
24-
</PropertyGroup>
25-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
26-
<DebugType>pdbonly</DebugType>
27-
<Optimize>true</Optimize>
28-
<OutputPath>bin\Release\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<ErrorReport>prompt</ErrorReport>
31-
<WarningLevel>4</WarningLevel>
32-
</PropertyGroup>
33-
<ItemGroup>
34-
<Reference Include="System" />
35-
<Reference Include="System.Data" />
36-
<Reference Include="System.Drawing" />
37-
<Reference Include="System.Xml" />
38-
</ItemGroup>
399
<ItemGroup>
40-
<Compile Include="HtmlSample.cs" />
41-
<Compile Include="Properties\Resources.Designer.cs">
10+
<Compile Update="Properties\Resources.Designer.cs">
4211
<DependentUpon>Resources.resx</DependentUpon>
4312
<AutoGen>True</AutoGen>
4413
<DesignTime>True</DesignTime>
4514
</Compile>
46-
<Compile Include="Resources.cs" />
47-
<Compile Include="SamplesLoader.cs" />
48-
<Compile Include="Properties\AssemblyInfo.cs" />
49-
<Compile Include="HtmlSyntaxHighlighter.cs" />
50-
<Compile Include="DemoUtils.cs" />
5115
</ItemGroup>
5216
<ItemGroup>
53-
<EmbeddedResource Include="PerfSamples\1.Big table.htm" />
54-
</ItemGroup>
55-
<ItemGroup>
56-
<EmbeddedResource Include="Properties\Resources.resx">
17+
<EmbeddedResource Update="Properties\Resources.resx">
5718
<Generator>PublicResXFileCodeGenerator</Generator>
5819
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
5920
<SubType>Designer</SubType>
6021
</EmbeddedResource>
61-
<EmbeddedResource Include="Resources\comment16.gif" />
62-
<EmbeddedResource Include="Resources\CustomFont.ttf" />
6322
</ItemGroup>
6423
<ItemGroup>
24+
<EmbeddedResource Include="Resources\CustomFont.ttf" />
25+
<EmbeddedResource Include="Resources\comment16.gif" />
6526
<EmbeddedResource Include="Resources\delete16.gif" />
66-
</ItemGroup>
67-
<ItemGroup>
6827
<EmbeddedResource Include="Resources\delete32.gif" />
69-
</ItemGroup>
70-
<ItemGroup>
7128
<EmbeddedResource Include="Resources\Event16.png" />
7229
<EmbeddedResource Include="Resources\html32.png" />
73-
<EmbeddedResource Include="TestSamples\31.ACID 1.htm" />
74-
<EmbeddedResource Include="TestSamples\30.Misc.htm" />
75-
<EmbeddedResource Include="TestSamples\21.Bullets.htm" />
76-
<EmbeddedResource Include="TestSamples\20.Fonts decorations.htm" />
77-
<EmbeddedResource Include="TestSamples\19.Many images.htm" />
78-
<EmbeddedResource Include="TestSamples\18.Anchors.htm" />
79-
<EmbeddedResource Include="TestSamples\17.Languages.htm" />
80-
<EmbeddedResource Include="TestSamples\16.Borders.htm" />
81-
<EmbeddedResource Include="TestSamples\15.MaxWidth.htm" />
82-
<EmbeddedResource Include="TestSamples\14.Iframes.htm" />
83-
<EmbeddedResource Include="TestSamples\13.Tables.htm" />
84-
<EmbeddedResource Include="TestSamples\12.Text.htm" />
85-
<EmbeddedResource Include="TestSamples\11.LineHeight.htm" />
86-
<EmbeddedResource Include="TestSamples\10.BlockInInline.htm" />
87-
<EmbeddedResource Include="TestSamples\09.Inline.htm" />
88-
<EmbeddedResource Include="TestSamples\08.White-space.htm" />
89-
<EmbeddedResource Include="TestSamples\07.Background Image.htm" />
90-
<EmbeddedResource Include="TestSamples\06.External Image.htm" />
91-
<EmbeddedResource Include="TestSamples\05.Images.htm" />
92-
<EmbeddedResource Include="TestSamples\04.Blockquotes.htm" />
93-
<EmbeddedResource Include="TestSamples\03.Paragraphs.htm" />
94-
<EmbeddedResource Include="TestSamples\02.Line break.htm" />
95-
<EmbeddedResource Include="TestSamples\01.Header.htm" />
96-
<EmbeddedResource Include="Samples\20.About.htm" />
97-
<EmbeddedResource Include="Samples\14.HtmlContainer.htm" />
98-
<EmbeddedResource Include="Samples\13.HtmlRender.htm" />
99-
<EmbeddedResource Include="Samples\12.HtmlToolTip.htm" />
100-
<EmbeddedResource Include="Samples\11.HtmlLabel.htm" />
101-
<EmbeddedResource Include="Samples\10.HtmlPanel.htm" />
102-
<EmbeddedResource Include="Samples\09.Using the library.htm" />
103-
<EmbeddedResource Include="Samples\08.Tooltip.htm" />
104-
<EmbeddedResource Include="Samples\07.Additional features.htm" />
105-
<EmbeddedResource Include="Samples\06.Embeded video.htm" />
106-
<EmbeddedResource Include="Samples\05.Images.htm" />
107-
<EmbeddedResource Include="Samples\04.Links.htm" />
108-
<EmbeddedResource Include="Samples\03.Tables.htm" />
109-
<EmbeddedResource Include="Samples\02.Text.htm" />
110-
<EmbeddedResource Include="Samples\01.History.htm" />
111-
<EmbeddedResource Include="Samples\00.Intro.htm" />
11230
<EmbeddedResource Include="Resources\web_pallete.gif" />
11331
<EmbeddedResource Include="Resources\property16.gif" />
11432
<EmbeddedResource Include="Resources\method16.gif" />
11533
<EmbeddedResource Include="Resources\formula32.png" />
11634
<EmbeddedResource Include="Resources\font32.png" />
11735
<EmbeddedResource Include="Resources\favorites32.png" />
118-
</ItemGroup>
119-
<ItemGroup>
12036
<EmbeddedResource Include="Resources\Tooltip.html" />
121-
</ItemGroup>
122-
<ItemGroup>
123-
<EmbeddedResource Include="TestSamples\22.RTL.htm" />
124-
</ItemGroup>
125-
<ItemGroup>
126-
<EmbeddedResource Include="PerfSamples\2.Lots blocks in inline.htm" />
127-
</ItemGroup>
128-
<ItemGroup>
12937
<EmbeddedResource Include="Resources\chrome.png" />
130-
</ItemGroup>
131-
<ItemGroup>
13238
<EmbeddedResource Include="Resources\code.png" />
133-
</ItemGroup>
134-
<ItemGroup>
13539
<EmbeddedResource Include="Resources\form.png" />
136-
</ItemGroup>
137-
<ItemGroup>
13840
<EmbeddedResource Include="Resources\browser.png" />
139-
</ItemGroup>
140-
<ItemGroup>
14141
<EmbeddedResource Include="Resources\image.png" />
142-
</ItemGroup>
143-
<ItemGroup>
14442
<EmbeddedResource Include="Resources\pdf.png" />
145-
</ItemGroup>
146-
<ItemGroup>
14743
<EmbeddedResource Include="Resources\stopwatch.png" />
148-
</ItemGroup>
149-
<ItemGroup>
150-
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj">
151-
<Project>{FE611685-391F-4E3E-B27E-D3150E51E49B}</Project>
152-
<Name>HtmlRenderer</Name>
153-
</ProjectReference>
154-
</ItemGroup>
155-
<ItemGroup>
15644
<EmbeddedResource Include="Resources\image32.png" />
15745
</ItemGroup>
15846
<ItemGroup>
47+
<EmbeddedResource Include="TestSamples\01.Header.htm" />
48+
<EmbeddedResource Include="TestSamples\02.Line break.htm" />
49+
<EmbeddedResource Include="TestSamples\03.Paragraphs.htm" />
50+
<EmbeddedResource Include="TestSamples\04.Blockquotes.htm" />
51+
<EmbeddedResource Include="TestSamples\05.Images.htm" />
52+
<EmbeddedResource Include="TestSamples\06.External Image.htm" />
53+
<EmbeddedResource Include="TestSamples\07.Background Image.htm" />
54+
<EmbeddedResource Include="TestSamples\08.White-space.htm" />
55+
<EmbeddedResource Include="TestSamples\09.Inline.htm" />
56+
<EmbeddedResource Include="TestSamples\10.BlockInInline.htm" />
57+
<EmbeddedResource Include="TestSamples\11.LineHeight.htm" />
58+
<EmbeddedResource Include="TestSamples\12.Text.htm" />
59+
<EmbeddedResource Include="TestSamples\13.Tables.htm" />
60+
<EmbeddedResource Include="TestSamples\14.Iframes.htm" />
61+
<EmbeddedResource Include="TestSamples\15.MaxWidth.htm" />
62+
<EmbeddedResource Include="TestSamples\16.Borders.htm" />
63+
<EmbeddedResource Include="TestSamples\17.Languages.htm" />
64+
<EmbeddedResource Include="TestSamples\18.Anchors.htm" />
65+
<EmbeddedResource Include="TestSamples\19.Many images.htm" />
66+
<EmbeddedResource Include="TestSamples\20.Fonts decorations.htm" />
67+
<EmbeddedResource Include="TestSamples\21.Bullets.htm" />
68+
<EmbeddedResource Include="TestSamples\22.RTL.htm" />
69+
<EmbeddedResource Include="TestSamples\30.Misc.htm" />
70+
<EmbeddedResource Include="TestSamples\31.ACID 1.htm" />
15971
<EmbeddedResource Include="TestSamples\32.Image in css content.htm" />
160-
</ItemGroup>
161-
<ItemGroup>
16272
<EmbeddedResource Include="TestSamples\33.Fixed position.htm" />
163-
</ItemGroup>
164-
<ItemGroup>
16573
<EmbeddedResource Include="TestSamples\34.Breaking pages 1 - Paragraphs.htm" />
74+
<EmbeddedResource Include="TestSamples\35.Breaking pages 2 - Tables.htm" />
75+
<EmbeddedResource Include="Samples\00.Intro.htm" />
76+
<EmbeddedResource Include="Samples\01.History.htm" />
77+
<EmbeddedResource Include="Samples\02.Text.htm" />
78+
<EmbeddedResource Include="Samples\03.Tables.htm" />
79+
<EmbeddedResource Include="Samples\04.Links.htm" />
80+
<EmbeddedResource Include="Samples\06.Embeded video.htm" />
81+
<EmbeddedResource Include="Samples\07.Additional features.htm" />
82+
<EmbeddedResource Include="Samples\08.Tooltip.htm" />
83+
<EmbeddedResource Include="Samples\09.Using the library.htm" />
84+
<EmbeddedResource Include="Samples\10.HtmlPanel.htm" />
85+
<EmbeddedResource Include="Samples\11.HtmlLabel.htm" />
86+
<EmbeddedResource Include="Samples\12.HtmlToolTip.htm" />
87+
<EmbeddedResource Include="Samples\13.HtmlRender.htm" />
88+
<EmbeddedResource Include="Samples\14.HtmlContainer.htm" />
89+
<EmbeddedResource Include="Samples\20.About.htm" />
90+
<EmbeddedResource Include="PerfSamples\1.Big table.htm" />
91+
<EmbeddedResource Include="PerfSamples\2.Lots blocks in inline.htm" />
16692
</ItemGroup>
16793
<ItemGroup>
168-
<EmbeddedResource Include="TestSamples\35.Breaking pages 2 - Tables.htm" />
94+
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj" />
16995
</ItemGroup>
170-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
171-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
172-
Other similar extension points exist, see Microsoft.Common.targets.
173-
<Target Name="BeforeBuild">
174-
</Target>
175-
<Target Name="AfterBuild">
176-
</Target>
177-
-->
17896
</Project>

‎Source/Demo/Common/Properties/Resources.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Source/Demo/Common/Samples/00.Intro.htm‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ <h1 align="center" style="color: white">
2222
This project allows you to have the rich format power of HTML on your desktop applications
2323
without <b>WebBrowser</b> control or <b>MSHTML</b>.<br />
2424
The library is <b>100% managed code</b> without any external dependencies, the only
25-
requirement is <b>.NET 2.0 or higher</b>, including support for Client Profile.
25+
requirement is <b>.NET Framework 4.6.2 or higher</b>, including support for Client Profile.
2626
</td>
2727
</tr>
2828
</table>
@@ -63,7 +63,6 @@ <h3>
6363
</h3>
6464
<ul>
6565
<li>100% managed code and no external dependencies.</li>
66-
<li>Supports .NET 2.0 or higher including Client Profile.</li>
6766
<li>Handles "real world" malformed HTML, it doesn't have to be XHTML.</li>
6867
<li>Lightweight (~300K).</li>
6968
<li>High performance and low memory footprint.</li>

0 commit comments

Comments
 (0)