Fixed issue #1, added support for async usage

zorgoz · Aug 4, 2018 · 47077ea · 47077ea
1 parent 1afb375
commit 47077ea
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 96 deletions.
diff --git a/zorgoz.Nlog4LinqPad/LinqPadExtensions.cs b/zorgoz.Nlog4LinqPad/LinqPadExtensions.cs
diff --git a/zorgoz.Nlog4LinqPad/LinqPadHtmlTarget.cs b/zorgoz.Nlog4LinqPad/LinqPadHtmlTarget.cs
@@ -22,8 +22,6 @@ public LinqPadHtmlTarget()
 
 		public TargetStyling Styling { get; set; } = TargetStyling.Default;
 
-		public string Prepend { get; set; }
-		public string Append { get; set; }
 		public string ItemNode { get; set; } = "span";
 		public string RowNode { get; set; } = "div";
 		public string PanelName { get; set; }
@@ -46,14 +44,20 @@ public override Layout Layout
 
 		protected override void InitializeTarget()
 		{
-			Util.RawHtml(@"<!DOCTYPE HTML><html><head><meta http-equiv=""Content-Type"" content=""text/html; charset=utf-8""/><meta http-equiv=""X-UA-Compatible"" content=""IE=edge""/>").DumpToPanel(PanelName);
-			Util.RawHtml(GetHtmlStyleTag()).DumpToPanel(PanelName);
-			Util.RawHtml("</head><body>").DumpToPanel(PanelName);
+			if (string.IsNullOrWhiteSpace(PanelName))
+			{
+				Util.RawHtml(GetHtmlStyleTag()).Dump();
+			}
+			else
+			{
+				GetHtmlStyleTag().InitPanel(PanelName);
+			}
 		}
 
 		protected override void CloseTarget()
 		{
 			Util.RawHtml("</body></html>").DumpToPanel(PanelName);
+			PanelHelper.End();
 		}
 
 		private bool HasRowStyle => !string.IsNullOrWhiteSpace(Styling.Row);

diff --git a/zorgoz.Nlog4LinqPad/packages.config b/zorgoz.Nlog4LinqPad/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="NLog" version="4.5.6" targetFramework="net47" />
+  <package id="System.Reactive" version="4.0.0" targetFramework="net46" />
 </packages>
diff --git a/zorgoz.Nlog4LinqPad/zorgoz.Nlog4LinqPad.csproj b/zorgoz.Nlog4LinqPad/zorgoz.Nlog4LinqPad.csproj
@@ -50,20 +50,20 @@
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Reactive, Version=4.0.0.0, Culture=neutral, PublicKeyToken=94bc3704cddfc263, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Reactive.4.0.0\lib\net46\System.Reactive.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Transactions" />
+    <Reference Include="System.Windows" />
     <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="LinqPadExtensions.cs" />
+    <Compile Include="PanelHelper.cs" />
     <Compile Include="LinqPadHtmlTarget.cs" />
     <Compile Include="Nlog4LinqPad.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

diff --git a/zorgoz.Nlog4LinqPad/zorgoz.Nlog4LinqPad.nuspec b/zorgoz.Nlog4LinqPad/zorgoz.Nlog4LinqPad.nuspec
@@ -2,15 +2,15 @@
 <package >
   <metadata>
     <id>$title$</id>
-    <version>0.5.0</version>
+    <version>0.6.0</version>
     <title>$title$</title>
     <authors>$author$</authors>
     <owners>$author$</owners>
     <licenseUrl>https://github.com/zorgoz/Nlog4LinqPad/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/zorgoz/Nlog4LinqPad</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>NLog logging support for LinqPad</description>
-    <releaseNotes>Separate panel is using custom writer to optimize DOM. XML comments also added.</releaseNotes>
+    <releaseNotes>Fixed custom writer to support async usage.</releaseNotes>
     <copyright>Copyright 2018</copyright>
     <tags>nlog nlog-target linqpad logging utility library</tags>
   </metadata>