Skip to content
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.

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

Upgrade to .NET Standard 2.0; .NET Core 2.1; wkpdftohtml v0.12.5 for Windows #56

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[*]
end_of_line = crlf

[*.cs]
indent_style = space
indent_size = 4
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
.vs/
.vs/config
src/DinkToPdf/bin/
src/DinkToPdf/obj/
src/DinkToPfd.ConsoleApp/obj/
Expand All @@ -12,6 +14,7 @@ DinkToPdf.TestWebServer/bin/
DinkToPdf.TestWebServer/obj/
DinkToPfd.TestConsoleApp/Files/636281092862553384.pdf
DinkToPfd.TestConsoleApp/bin/Debug/
DinkToPfd.TestConsoleApp/bin/Release/
DinkToPfd.TestConsoleApp/libwkhtmltox.so
DinkToPfd.TestConsoleApp/obj/
DinkToPdf.TestWebServer/libwkhtmltox.so
Expand All @@ -22,3 +25,4 @@ DinkToPdf.TestThreadSafe/Files/
DinkToPdf.TestThreadSafe/Properties/
DinkToPdf.TestThreadSafe/libwkhtmltox.so
DinkToPfd.TestConsoleApp/Files/
*.user
8 changes: 8 additions & 0 deletions .vs/config/applicationhost.config
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,14 @@
<binding protocol="http" bindingInformation=":8080:localhost" />
</bindings>
</site>
<site name="DinkToPdf.TestWebServer" id="2">
<application path="/" applicationPool="Clr4IntegratedAppPool">
<virtualDirectory path="/" physicalPath="C:\Users\chris.bryden\Source\Repos\rndusr0\DinkToPdf\DinkToPdf.TestWebServer" />
</application>
<bindings>
<binding protocol="http" bindingInformation="*:50554:localhost" />
</bindings>
</site>
<siteDefaults>
<logFile logFormat="W3C" directory="%IIS_USER_HOME%\Logs" />
<traceFailedRequestsLogging directory="%IIS_USER_HOME%\TraceLogFiles" enabled="true" maxLogFileSizeKB="1024" />
Expand Down
21 changes: 21 additions & 0 deletions DinkToPdf.TestThreadSafe/DinkToPdf.TestThreadSafe.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>netcoreapp2.1</TargetFramework>
<AssemblyName>DinkToPdf.TestThreadSafe</AssemblyName>
<OutputType>Exe</OutputType>
<PackageId>DinkToPdf.TestThreadSafe</PackageId>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\src\DinkToPdf\DinkToPdf.csproj" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.IO.FileSystem" Version="4.3.0" />
</ItemGroup>

</Project>
19 changes: 0 additions & 19 deletions DinkToPdf.TestThreadSafe/DinkToPdf.TestThreadSafe.xproj

This file was deleted.

21 changes: 0 additions & 21 deletions DinkToPdf.TestThreadSafe/project.json

This file was deleted.

Loading