Skip to content

Commit 3f41e4b

Browse files
eXpl0it3reXpl0it3r
committed
Update projects to .NET 8 or .NET Standard 2.0
- Replace SharedAssemblyInfo with Directory.Build.props properties - Remove code paths for Mono support - Fix deprecation warnings - Fix path handling for the PDF exports
1 parent c609772 commit 3f41e4b

26 files changed

+73
-344
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net462</TargetFramework>
3+
<TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
44
<OutputType>Library</OutputType>
55
<RootNamespace>TheArtOfDev.HtmlRenderer.Demo.Common</RootNamespace>
66
<AssemblyName>HtmlRendererDemoCommon</AssemblyName>
7-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
8-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
7+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
98
</PropertyGroup>
109
<ItemGroup>
1110
<Compile Update="Properties\Resources.Designer.cs">
@@ -91,6 +90,9 @@
9190
<EmbeddedResource Include="PerfSamples\1.Big table.htm" />
9291
<EmbeddedResource Include="PerfSamples\2.Lots blocks in inline.htm" />
9392
</ItemGroup>
93+
<ItemGroup>
94+
<PackageReference Include="System.Drawing.Common" Version="10.0.1" />
95+
</ItemGroup>
9496
<ItemGroup>
9597
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj" />
9698
</ItemGroup>

‎Source/Demo/Common/Properties/AssemblyInfo.cs‎

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

‎Source/Demo/WPF/App.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ private static Assembly OnResolveAssembly(object sender, ResolveEventArgs args)
4343
if (stream != null)
4444
{
4545
byte[] assemblyRawBytes = new byte[stream.Length];
46-
stream.Read(assemblyRawBytes, 0, assemblyRawBytes.Length);
46+
stream.ReadExactly(assemblyRawBytes);
4747
return Assembly.Load(assemblyRawBytes);
4848
}
4949
return null;

‎Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj‎

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net462</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<RootNamespace>TheArtOfDev.HtmlRenderer.Demo.WPF</RootNamespace>
66
<AssemblyName>HtmlRendererWpfDemo</AssemblyName>
77
<UseWPF>true</UseWPF>
8-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
9-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
8+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
109
</PropertyGroup>
1110
<PropertyGroup>
1211
<ApplicationIcon>html.ico</ApplicationIcon>
@@ -28,11 +27,4 @@
2827
<ItemGroup>
2928
<PackageReference Include="Extended.Wpf.Toolkit" Version="5.0.0" />
3029
</ItemGroup>
31-
<Target Name="AfterResolveReferences">
32-
<ItemGroup>
33-
<EmbeddedResource Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.dll'">
34-
<LogicalName>%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)</LogicalName>
35-
</EmbeddedResource>
36-
</ItemGroup>
37-
</Target>
3830
</Project>

‎Source/Demo/WPF/Properties/AssemblyInfo.cs‎

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

‎Source/Demo/WinForms/DemoForm.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public partial class DemoForm : Form
4040
/// </summary>
4141
public DemoForm()
4242
{
43-
SamplesLoader.Init(HtmlRenderingHelper.IsRunningOnMono() ? "Mono" : "WinForms", typeof(HtmlRender).Assembly.GetName().Version.ToString());
43+
SamplesLoader.Init("WinForms", typeof(HtmlRender).Assembly.GetName().Version.ToString());
4444

4545
InitializeComponent();
4646

@@ -59,8 +59,8 @@ public DemoForm()
5959

6060
LoadCustomFonts();
6161

62-
_showIEViewTSSB.Enabled = !HtmlRenderingHelper.IsRunningOnMono();
63-
_generatePdfTSB.Enabled = !HtmlRenderingHelper.IsRunningOnMono();
62+
_showIEViewTSSB.Enabled = true;
63+
_generatePdfTSB.Enabled = true;
6464
}
6565

6666
/// <summary>
@@ -145,10 +145,12 @@ private void OnGeneratePdf_Click(object sender, EventArgs e)
145145
config.SetMargins(20);
146146

147147
var doc = PdfGenerator.GeneratePdf(_mainControl.GetHtml(), config, null, DemoUtils.OnStylesheetLoad, HtmlRenderingHelper.OnImageLoadPdfSharp);
148+
148149
var tmpFile = Path.GetTempFileName();
149-
tmpFile = Path.GetFileNameWithoutExtension(tmpFile) + ".pdf";
150-
doc.Save(tmpFile);
151-
Process.Start(tmpFile);
150+
var pdfFile = Path.ChangeExtension(tmpFile, ".pdf"); // Preserves the full path
151+
doc.Save(pdfFile);
152+
153+
Process.Start(new ProcessStartInfo(pdfFile) { UseShellExecute = true });
152154
}
153155

154156
/// <summary>

‎Source/Demo/WinForms/GenerateImageForm.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ public GenerateImageForm(string html)
5151
}
5252
_textRenderingHintTSCB.SelectedItem = TextRenderingHint.AntiAlias.ToString();
5353

54-
_useGdiPlusTSB.Enabled = !HtmlRenderingHelper.IsRunningOnMono();
55-
_backgroundColorTSB.Enabled = !HtmlRenderingHelper.IsRunningOnMono();
54+
_useGdiPlusTSB.Enabled = true;
55+
_backgroundColorTSB.Enabled = true;
5656
}
5757

5858
private void OnSaveToFile_Click(object sender, EventArgs e)
@@ -103,7 +103,7 @@ private void GenerateImage()
103103
TextRenderingHint textRenderingHint = (TextRenderingHint)Enum.Parse(typeof(TextRenderingHint), _textRenderingHintTSCB.SelectedItem.ToString());
104104

105105
Image img;
106-
if (_useGdiPlusTSB.Checked || HtmlRenderingHelper.IsRunningOnMono())
106+
if (_useGdiPlusTSB.Checked)
107107
{
108108
img = HtmlRender.RenderToImageGdiPlus(_html, _pictureBox.ClientSize, textRenderingHint, null, DemoUtils.OnStylesheetLoad, HtmlRenderingHelper.OnImageLoad);
109109
}

‎Source/Demo/WinForms/HtmlRenderer.Demo.WinForms.csproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net462</TargetFramework>
3+
<TargetFramework>net8.0-windows</TargetFramework>
44
<OutputType>WinExe</OutputType>
55
<RootNamespace>TheArtOfDev.HtmlRenderer.Demo.WinForms</RootNamespace>
66
<AssemblyName>HtmlRendererWinFormsDemo</AssemblyName>
7-
<PublishUrl>publish\</PublishUrl>
87
<UseWindowsForms>true</UseWindowsForms>
9-
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
10-
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
11-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
8+
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
129
</PropertyGroup>
1310
<PropertyGroup>
1411
<ApplicationIcon>html.ico</ApplicationIcon>

‎Source/Demo/WinForms/HtmlRenderingHelper.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,6 @@ internal static class HtmlRenderingHelper
3232

3333
#endregion
3434

35-
36-
/// <summary>
37-
/// Check if currently running in mono.
38-
/// </summary>
39-
public static bool IsRunningOnMono()
40-
{
41-
return Type.GetType("Mono.Runtime") != null;
42-
}
43-
4435
/// <summary>
4536
/// Create image to be used to fill background so it will be clear that what's on top is transparent.
4637
/// </summary>

‎Source/Demo/WinForms/MainControl.cs‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
// "The Art of War"
1212

1313
using System;
14+
using System.ComponentModel;
1415
using System.Drawing;
1516
using System.Drawing.Imaging;
1617
using System.IO;
@@ -72,6 +73,8 @@ public MainControl()
7273
/// <summary>
7374
/// used ignore html editor updates when updating separately
7475
/// </summary>
76+
[Browsable(false)]
77+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
7578
public bool UpdateLock
7679
{
7780
get { return _updateLock; }
@@ -81,6 +84,8 @@ public bool UpdateLock
8184
/// <summary>
8285
/// In IE view if to show original html or the html generated from the html control
8386
/// </summary>
87+
[Browsable(false)]
88+
[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]
8489
public bool UseGeneratedHtml
8590
{
8691
get { return _useGeneratedHtml; }
@@ -186,7 +191,7 @@ private void OnSamplesTreeViewAfterSelect(object sender, TreeViewEventArgs e)
186191
{
187192
_updateLock = true;
188193

189-
if (!HtmlRenderingHelper.IsRunningOnMono() && e.Node.Parent.Text != PerformanceSamplesTreeNodeName)
194+
if (e.Node.Parent.Text != PerformanceSamplesTreeNodeName)
190195
SetColoredText(sample.Html);
191196
else
192197
_htmlEditor.Text = sample.Html;

0 commit comments

Comments
 (0)