Merge pull request #25 from lankaapura/dev

Add .NET core support via Windows Compatibility Pack

Author: nblumhardt

appveyor.yml

@@ -1,13 +1,9 @@
 version: '{build}'
 skip_tags: true
-image: Visual Studio 2015
+image: Visual Studio 2017
 configuration: Release
 install:
-  - ps: mkdir -Force ".\build\" | Out-Null  
-  - ps: Invoke-WebRequest "https://raw.githubusercontent.com/dotnet/cli/rel/1.0.0/scripts/obtain/dotnet-install.ps1" -OutFile ".\build\installcli.ps1"
-  - ps: $env:DOTNET_INSTALL_DIR = "$pwd\.dotnetcli"  
-  - ps: '& .\build\installcli.ps1 -InstallDir "$env:DOTNET_INSTALL_DIR" -NoPath -Version 1.0.1'    
-  - ps: $env:Path = "$env:DOTNET_INSTALL_DIR;$env:Path"
+  - ps: mkdir -Force ".\build\" | Out-Null
 build_script:
 - ps: ./Build.ps1
 test: off
@@ -27,4 +23,3 @@ deploy:
   tag: v$(appveyor_build_version)
   on:
     branch: master
-    

sample/Sample/Sample.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net452</TargetFramework>
+    <TargetFrameworks>net452;net461;netcoreapp2.0;</TargetFrameworks>
     <AssemblyName>Sample</AssemblyName>
     <OutputType>Exe</OutputType>
     <PackageId>Sample</PackageId>
@@ -19,5 +19,4 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
 </Project>

src/Serilog.Sinks.EventLog/LoggerConfigurationEventLogExtensions.cs

@@ -19,6 +19,10 @@
 using Serilog.Sinks.EventLog;
 using Serilog.Formatting;
 
+#if NETSTANDARD2_0
+using System.Runtime.InteropServices;
+#endif
+
 namespace Serilog
 {
     /// <summary>
@@ -53,8 +57,19 @@ public static LoggerConfiguration EventLog(
             LogEventLevel restrictedToMinimumLevel = LevelAlias.Minimum,
             IEventIdProvider eventIdProvider = null)
         {
-            if (loggerConfiguration == null) throw new ArgumentNullException(nameof(loggerConfiguration));
+            if (loggerConfiguration == null)
+            {
+                throw new ArgumentNullException(nameof(loggerConfiguration));
+            }
 
+
+#if NETSTANDARD2_0
+            // Verify the code is running on Windows.
+            if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                throw new PlatformNotSupportedException(RuntimeInformation.OSDescription);
+            }
+#endif
             var formatter = new MessageTemplateTextFormatter(outputTemplate, formatProvider);
 
             if (eventIdProvider == null)

src/Serilog.Sinks.EventLog/Serilog.Sinks.EventLog.csproj

@@ -7,7 +7,7 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <VersionPrefix>3.1.0</VersionPrefix>
     <Authors>Jeremy Clarke;Fabian Wetzel</Authors>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net45;netstandard2.0;</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyName>Serilog.Sinks.EventLog</AssemblyName>
@@ -28,9 +28,14 @@
     <PackageReference Include="Serilog" Version="2.3.0" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Diagnostics.EventLog">
+      <Version>4.5.0-preview1-25914-04</Version>
+    </PackageReference>
+  </ItemGroup>
+
   <ItemGroup Condition=" '$(TargetFramework)' == 'net45' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
-
 </Project>

test/Serilog.Sinks.EventLog.Tests/Serilog.Sinks.EventLog.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net451</TargetFramework>
+    <TargetFrameworks>net451;net461;netcoreapp2.0;</TargetFrameworks>
     <AssemblyName>Serilog.Sinks.EventLog.Tests</AssemblyName>
     <AssemblyOriginatorKeyFile>../../assets/Serilog.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>
@@ -21,22 +21,22 @@
   </ItemGroup>
 
   <ItemGroup>    
-      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
-      <PackageReference Include="NUnit3TestAdapter" Version="3.8.0-alpha1" />
+      <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
+      <PackageReference Include="NUnit3TestAdapter" Version="3.9.0" />
       <PackageReference Include="Serilog" Version="2.3.0" />
       <PackageReference Include="Serilog.Settings.Configuration" Version="2.3.1" />
       <PackageReference Include="Microsoft.Extensions.Configuration.Xml" Version="1.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="9.0.1" />
-      <PackageReference Include="NUnit" Version="3.5.0" />      
-  </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
-    <Reference Include="System" />
-    <Reference Include="Microsoft.CSharp" />
+      <PackageReference Include="NUnit" Version="3.9.0" />      
   </ItemGroup>
 
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
+    <Reference Include="System" />
+    <Reference Include="Microsoft.CSharp" />
+  </ItemGroup>
+  
 </Project>