diff --git a/.gitignore b/.gitignore index 1cd25391..c5debf86 100644 --- a/.gitignore +++ b/.gitignore @@ -10,4 +10,6 @@ packages # mstest test results TestResults *.nupkg -OpenHtmlToPdf.sln.DotSettings \ No newline at end of file +OpenHtmlToPdf.sln.DotSettings +**/.vs/* +**/.vshistory/* \ No newline at end of file diff --git a/OpenHtmlToPdf.Tests/OpenHtmlToPdf.Tests.csproj b/OpenHtmlToPdf.Tests/OpenHtmlToPdf.Tests.csproj index fe005779..5a9cbbe8 100644 --- a/OpenHtmlToPdf.Tests/OpenHtmlToPdf.Tests.csproj +++ b/OpenHtmlToPdf.Tests/OpenHtmlToPdf.Tests.csproj @@ -1,106 +1,27 @@ - - + - Debug - AnyCPU - {F392B363-55E0-409F-8376-C0DA47AF4A64} - Library - Properties - OpenHtmlToPdf.Tests - OpenHtmlToPdf.Tests - v4.5 - 512 - {3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 10.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - $(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages - False - UnitTest - ..\ - true + netcoreapp3.1;net45 + + false - - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - ..\packages\iTextSharp.5.5.3\lib\itextsharp.dll - - - - - - - - - - - - - - - + - - - - + + + + - - + + + 5.5.13.2 + - - - {023df833-b252-48b3-b6af-dbbb13e39b13} - OpenHtmlToPdf - + + - - - - - False - - - False - - - False - - - False - - - - - - - - - - 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}. - - - - - \ No newline at end of file + + + + + + diff --git a/OpenHtmlToPdf.Tests/Properties/AssemblyInfo.cs b/OpenHtmlToPdf.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 7aaed991..00000000 --- a/OpenHtmlToPdf.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -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("OpenHtmlToPdf.Tests")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("OpenHtmlToPdf.Tests")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("8ffc1b4a-af9b-41db-980a-498ce0e85d62")] - -// 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")] diff --git a/OpenHtmlToPdf.WkHtmlToPdf/App.config b/OpenHtmlToPdf.WkHtmlToPdf/App.config index 8e156463..8fc05512 100644 --- a/OpenHtmlToPdf.WkHtmlToPdf/App.config +++ b/OpenHtmlToPdf.WkHtmlToPdf/App.config @@ -1,6 +1,6 @@ - + - + - \ No newline at end of file + diff --git a/OpenHtmlToPdf.WkHtmlToPdf/OpenHtmlToPdf.WkHtmlToPdf.csproj b/OpenHtmlToPdf.WkHtmlToPdf/OpenHtmlToPdf.WkHtmlToPdf.csproj index fe3c6bed..efdd7b52 100644 --- a/OpenHtmlToPdf.WkHtmlToPdf/OpenHtmlToPdf.WkHtmlToPdf.csproj +++ b/OpenHtmlToPdf.WkHtmlToPdf/OpenHtmlToPdf.WkHtmlToPdf.csproj @@ -9,10 +9,11 @@ Properties OpenHtmlToPdf.WkHtmlToPdf OpenHtmlToPdf.WkHtmlToPdf - v4.5 + v4.7.1 512 ..\ true + AnyCPU @@ -51,9 +52,6 @@ - - Properties\AssemblyInfo.cs - @@ -74,6 +72,9 @@ + + + diff --git a/OpenHtmlToPdf/Assets/OpenHtmlToPdf.WkHtmlToPdf.exe b/OpenHtmlToPdf/Assets/OpenHtmlToPdf.WkHtmlToPdf.exe index f8421b37..cb946031 100644 Binary files a/OpenHtmlToPdf/Assets/OpenHtmlToPdf.WkHtmlToPdf.exe and b/OpenHtmlToPdf/Assets/OpenHtmlToPdf.WkHtmlToPdf.exe differ diff --git a/OpenHtmlToPdf/OpenHtmlToPdf.csproj b/OpenHtmlToPdf/OpenHtmlToPdf.csproj index 35b4232e..f98d93a5 100644 --- a/OpenHtmlToPdf/OpenHtmlToPdf.csproj +++ b/OpenHtmlToPdf/OpenHtmlToPdf.csproj @@ -1,137 +1,33 @@ - - + + - Release - x86 - 8.0.30703 - 2.0 - {023DF833-B252-48B3-B6AF-DBBB13E39B13} - Library - Properties - OpenHtmlToPdf - OpenHtmlToPdf - v4.5 - 512 - ..\ - true - - - - true - bin\Debug\ - DEBUG;TRACE - true - full - x86 - bin\Debug\Pechkin.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - - - bin\Release\ - TRACE - true - true - pdbonly - x86 - bin\Release\Pechkin.dll.CodeAnalysisLog.xml - true - GlobalSuppressions.cs - prompt - MinimumRecommendedRules.ruleset - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\\Rule Sets - ;C:\Program Files (x86)\Microsoft Visual Studio 10.0\Team Tools\Static Analysis Tools\FxCop\\Rules - false - - - true - bin\x64\Debug\ - DEBUG;TRACE - true - full - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - bin\x64\Release\ - TRACE - true - true - pdbonly - x64 - prompt - MinimumRecommendedRules.ruleset - false - - - true - bin\Debug\ - DEBUG;TRACE - true - full - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - - bin\Release\ - TRACE - true - true - pdbonly - AnyCPU - prompt - MinimumRecommendedRules.ruleset - false - - - - + net45;netstandard2.0 + 1.13.0 + + .NET library for rendering HTML documents to PDF format. + (port to net45+ and netstandard2.0+ -> including netcore and net5.0+) + Copyright - 2014 Timo Vilppu - 2022 Clystian + README.md + + https://github.com/clystian/OpenHtmlToPdf + https://github.com/clystian/OpenHtmlToPdf + pdf,html,netstandard + + - - - - - + - - - ConversionSource.cs - - - - - - - - - - - - - - + + + + True + \ + - + - - - + \ No newline at end of file diff --git a/OpenHtmlToPdf/Properties/AssemblyInfo.cs b/OpenHtmlToPdf/Properties/AssemblyInfo.cs deleted file mode 100644 index 7f45ceb2..00000000 --- a/OpenHtmlToPdf/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,35 +0,0 @@ -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("OpenHtmlToPdf")] -[assembly: AssemblyDescription(".NET library for rendering HTML documents to PDF format.")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Timo Vilppu")] -[assembly: AssemblyProduct("OpenHtmlToPdf")] -[assembly: AssemblyCopyright("Copyright 2014 Timo Vilppu")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("cbc60f0e-fd71-4cc1-bd88-fa4043b1e90b")] - -// 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.12.0")] -[assembly: AssemblyFileVersion("1.12.0")] diff --git a/packages/repositories.config b/packages/repositories.config deleted file mode 100644 index 3eeaf001..00000000 --- a/packages/repositories.config +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file