Skip to content

Net 8 Migration #212

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Net 8 Migration #212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
31afc9b
Update .gitignore for build artifacts and tools
bistok Jul 10, 2025
7457e0d
Update projects to target .NET Framework 4.8
bistok Jul 10, 2025
0b88043
Add five new binary image files
bistok Jul 11, 2025
c7b0548
Net 8 Project Migration
bistok Jul 11, 2025
fddca85
Merge pull request #1 from bistok/Net8
bistok Jul 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
434 changes: 404 additions & 30 deletions .gitignore
View file
Open in desktop

Large diffs are not rendered by default.

77 changes: 26 additions & 51 deletions Source/Demo/Common/HtmlRenderer.Demo.Common.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,59 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{2390B71F-9400-47F4-B23A-7F2649C87D35}</ProjectGuid>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TheArtOfDev.HtmlRenderer.Demo.Common</RootNamespace>
<AssemblyName>HtmlRendererDemoCommon</AssemblyName>
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AssemblyTitle>HtmlRenderer.Demo.Common</AssemblyTitle>
<Product>HtmlRenderer.Demo.Common</Product>
<Copyright>Copyright © 2013</Copyright>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<FileVersion>1.0.0.0</FileVersion>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Xml" />
<None Remove="Resources\comment16.png" />
<None Remove="Resources\delete16.png" />
<None Remove="Resources\delete32.png" />
<None Remove="Resources\method16.png" />
<None Remove="Resources\property16.png" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\comment16.png" />
<EmbeddedResource Include="Resources\delete16.png" />
<EmbeddedResource Include="Resources\delete32.png" />
<EmbeddedResource Include="Resources\method16.png" />
<EmbeddedResource Include="Resources\property16.png" />
</ItemGroup>
<ItemGroup>
<Compile Include="HtmlSample.cs" />
<Compile Include="Properties\Resources.Designer.cs">
<Compile Update="Properties\Resources.Designer.cs">
<DependentUpon>Resources.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Resources.cs" />
<Compile Include="SamplesLoader.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="HtmlSyntaxHighlighter.cs" />
<Compile Include="DemoUtils.cs" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="PerfSamples\1.Big table.htm" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Properties\Resources.resx">
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
<SubType>Designer</SubType>
Expand Down Expand Up @@ -147,10 +129,7 @@
<EmbeddedResource Include="Resources\stopwatch.png" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj">
<Project>{FE611685-391F-4E3E-B27E-D3150E51E49B}</Project>
<Name>HtmlRenderer</Name>
</ProjectReference>
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj" />
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Resources\image32.png" />
Expand All @@ -167,12 +146,8 @@
<ItemGroup>
<EmbeddedResource Include="TestSamples\35.Breaking pages 2 - Tables.htm" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
<ItemGroup>
<PackageReference Include="System.Drawing.Common" Version="9.0.7" />
<PackageReference Include="System.Resources.Extensions" Version="9.0.7" />
</ItemGroup>
</Project>
25 changes: 0 additions & 25 deletions Source/Demo/Common/Properties/AssemblyInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,5 @@
using System.Reflection;
using System.Runtime.InteropServices;

// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.

[assembly: AssemblyTitle("HtmlRenderer.Demo.Common")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("HtmlRenderer.Demo.Common")]
[assembly: AssemblyCopyright("Copyright © 2013")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -23,17 +12,3 @@
// The following GUID is for the ID of the typelib if this project is exposed to COM

[assembly: Guid("5d5516c9-aa2c-44cc-883c-467ff9a3d9b9")]

// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]

[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
4 changes: 2 additions & 2 deletions Source/Demo/Common/Properties/Resources.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Source/Demo/Common/Resources.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static byte[] CustomFont

public static Stream Comment16
{
get { return GetManifestResourceStream("comment16.gif"); }
get { return GetManifestResourceStream("comment16.png"); }
}

public static Stream Event16
Expand Down Expand Up @@ -70,17 +70,17 @@ public static Stream Image32

public static Stream Method16
{
get { return GetManifestResourceStream("method16.gif"); }
get { return GetManifestResourceStream("method16.png"); }
}

public static Stream Property16
{
get { return GetManifestResourceStream("property16.gif"); }
get { return GetManifestResourceStream("property16.png"); }
}

public static Stream WebPallete
{
get { return GetManifestResourceStream("web_pallete.gif"); }
get { return GetManifestResourceStream("web_pallete.png"); }
}

public static string Tooltip
Expand Down
Binary file added Source/Demo/Common/Resources/comment16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Demo/Common/Resources/delete16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Demo/Common/Resources/delete32.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Demo/Common/Resources/method16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Source/Demo/Common/Resources/property16.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
130 changes: 8 additions & 122 deletions Source/Demo/WPF/HtmlRenderer.Demo.WPF.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,149 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{F02E0216-4AE3-474F-9381-FCB93411CDB0}</ProjectGuid>
<TargetFramework>net8.0-windows</TargetFramework>
<OutputType>WinExe</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>TheArtOfDev.HtmlRenderer.Demo.WPF</RootNamespace>
<AssemblyName>HtmlRendererWpfDemo</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<TargetFrameworkProfile />
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
<RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>x86</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup>
<UseWPF>true</UseWPF>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<ApplicationIcon>html.ico</ApplicationIcon>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="Xceed.Wpf.DataGrid">
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.2.1\lib\net40\Xceed.Wpf.DataGrid.dll</HintPath>
</Reference>
<Reference Include="Xceed.Wpf.Toolkit">
<HintPath>..\..\packages\Extended.Wpf.Toolkit.2.2.1\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="GenerateImageWindow.xaml.cs">
<DependentUpon>GenerateImageWindow.xaml</DependentUpon>
</Compile>
<Compile Include="SampleWindow.xaml.cs">
<DependentUpon>SampleWindow.xaml</DependentUpon>
</Compile>
<Compile Include="ToolStripImageConverter.cs" />
<Page Include="DemoWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="DemoWindow.xaml.cs">
<DependentUpon>DemoWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="GenerateImageWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="SampleWindow.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup>
<ItemGroup>
<Compile Include="HtmlRenderingHelper.cs" />
<Compile Include="MainControl.xaml.cs">
<DependentUpon>MainControl.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<AppDesigner Include="Properties\" />
<PackageReference Include="Extended.Wpf.Toolkit" Version="4.7.25104.5739" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\HtmlRenderer.WPF\HtmlRenderer.WPF.csproj">
<Project>{7e4e8db5-85ad-4388-bdcb-38c6f423b8b0}</Project>
<Name>HtmlRenderer.WPF</Name>
</ProjectReference>
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj">
<Project>{fe611685-391f-4e3e-b27e-d3150e51e49b}</Project>
<Name>HtmlRenderer</Name>
</ProjectReference>
<ProjectReference Include="..\Common\HtmlRenderer.Demo.Common.csproj">
<Project>{2390B71F-9400-47F4-B23A-7F2649C87D35}</Project>
<Name>HtmlRenderer.Demo.Common</Name>
</ProjectReference>
<ProjectReference Include="..\..\HtmlRenderer.WPF\HtmlRenderer.WPF.csproj" />
<ProjectReference Include="..\..\HtmlRenderer\HtmlRenderer.csproj" />
<ProjectReference Include="..\Common\HtmlRenderer.Demo.Common.csproj" />
</ItemGroup>
<ItemGroup>
<Resource Include="html.ico" />
</ItemGroup>
<ItemGroup>
<Resource Include="fonts\CustomFont.ttf" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="AfterResolveReferences">
<ItemGroup>
<EmbeddedResource Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Extension)' == '.dll'">
<LogicalName>%(ReferenceCopyLocalPaths.Filename)%(ReferenceCopyLocalPaths.Extension)</LogicalName>
</EmbeddedResource>
</ItemGroup>
</Target>
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
</Target>
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Loading