Merge pull request #190 from datalust/dev

5.2.2 Release
datalust · Nov 15, 2022 · 5fa0759 · 5fa0759
2 parents 5cd6dfd + f8e7b73
commit 5fa0759
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 40 deletions.
diff --git a/sample/Sample/Program.cs b/sample/Sample/Program.cs
@@ -1,46 +1,36 @@
 using System;
 using System.Linq;
 using System.Threading;
-using System.Threading.Tasks;
 using Serilog;
 using Serilog.Core;
 
-namespace Sample
-{
-    public static class Program
-    {
-        public static async Task Main()
-        {
-            // By sharing between the Seq sink and logger itself,
-            // Seq API keys can be used to control the level of the whole logging pipeline.
-            var levelSwitch = new LoggingLevelSwitch();
+// By sharing between the Seq sink and logger itself,
+// Seq API keys can be used to control the level of the whole logging pipeline.
+var levelSwitch = new LoggingLevelSwitch();
 
-            try
-            {
-                Log.Logger = new LoggerConfiguration()
-                    .MinimumLevel.ControlledBy(levelSwitch)
-                    .WriteTo.Console()
-                    .WriteTo.Seq("http://localhost:5341", controlLevelSwitch: levelSwitch)
-                    .CreateLogger();
+try
+{
+    Log.Logger = new LoggerConfiguration()
+        .MinimumLevel.ControlledBy(levelSwitch)
+        .WriteTo.Console()
+        .WriteTo.Seq("http://localhost:5341", controlLevelSwitch: levelSwitch)
+        .CreateLogger();
 
-                Log.Information("Sample starting up");
+    Log.Information("Sample starting up");
 
-                foreach (var i in Enumerable.Range(0, 100))
-                {
-                    Log.Information("Running loop {Counter}, switch is at {Level}", i, levelSwitch.MinimumLevel);
+    foreach (var i in Enumerable.Range(0, 100))
+    {
+        Log.Information("Running loop {Counter}, switch is at {Level}", i, levelSwitch.MinimumLevel);
 
-                    Thread.Sleep(1000);
-                    Log.Debug("Loop iteration done");
-                }
-            }
-            catch (Exception ex)
-            {
-                Log.Error(ex, "Unhandled exception");
-            }
-            finally
-            {
-                await Log.CloseAndFlushAsync();
-            }
-        }
+        Thread.Sleep(1000);
+        Log.Debug("Loop iteration done");
     }
 }
+catch (Exception ex)
+{
+    Log.Error(ex, "Unhandled exception");
+}
+finally
+{
+    await Log.CloseAndFlushAsync();
+}
diff --git a/sample/Sample/Sample.csproj b/sample/Sample/Sample.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net4.8;net5.0</TargetFrameworks>
+    <TargetFramework>net6.0</TargetFramework>
     <OutputType>Exe</OutputType>
     <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
@@ -10,10 +10,6 @@
   <ItemGroup>
     <PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" />
   </ItemGroup>
-
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net4.8' ">
-    <Reference Include="System.Net.Http" />
-  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Serilog.Sinks.Seq\Serilog.Sinks.Seq.csproj" />

diff --git a/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj b/src/Serilog.Sinks.Seq/Serilog.Sinks.Seq.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Serilog sink that writes to the Seq log server over HTTP/HTTPS.</Description>
-    <VersionPrefix>5.2.1</VersionPrefix>
+    <VersionPrefix>5.2.2</VersionPrefix>
     <Authors>Serilog Contributors</Authors>
     <Copyright>Copyright © Serilog Contributors</Copyright>
     <TargetFrameworks>net5.0;netstandard1.1;netstandard1.3;netstandard2.0;net4.5;netcoreapp3.1</TargetFrameworks>

diff --git a/src/Serilog.Sinks.Seq/Sinks/Seq/Http/SeqIngestionApiClient.cs b/src/Serilog.Sinks.Seq/Sinks/Seq/Http/SeqIngestionApiClient.cs
@@ -14,6 +14,7 @@
 
 using System;
 using System.Net.Http;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Threading.Tasks;
 using Serilog.Events;
@@ -38,6 +39,9 @@ public SeqIngestionApiClient(string serverUrl, string? apiKey, HttpMessageHandle
             _apiKey = apiKey;
             _httpClient = messageHandler != null
                     ? new HttpClient(messageHandler)
+                    : RuntimeInformation.IsOSPlatform(OSPlatform.Create("WEBASSEMBLY"))
+                    // Can't set PooledConnectionLifetime on this platform
+                    ? new HttpClient()
                     :
 #if SOCKETS_HTTP_HANDLER_ALWAYS_DEFAULT
                     new HttpClient(new SocketsHttpHandler