Merge pull request #55 from datalust/dev

2.1.0 Release

Author: KodrAus

appveyor.yml

@@ -12,7 +12,7 @@ artifacts:
 deploy:
 - provider: NuGet
   api_key:
-    secure: Hl9pr1a2/2Y9u9XwPO8FUCpGbO8taYFhYVnDRJbvl3rs5fcFaqd91+QbrcrtES/x
+    secure: 71c2lLlQfEUp7lWA9Zo+BneSkHO5xuZVeIt+bqmqlzHg4g3NgVf0Buwp4pAhoGO5
   skip_symbols: true
   on:
     branch: /^(main|dev)$/

global.json

@@ -1,5 +1,5 @@
 {
   "sdk": {
-    "version": "5.0.102"
+    "version": "5.0.401"
   }
 }

src/NLog.Targets.Seq/NLog.Targets.Seq.csproj

@@ -3,7 +3,7 @@
   <PropertyGroup>
     <Description>An NLog target that writes structured log events to Seq</Description>
     <Authors>Datalust;Contributors</Authors>
-    <VersionPrefix>2.0.0</VersionPrefix>
+    <VersionPrefix>2.1.0</VersionPrefix>
     <TargetFrameworks>net4.5;net4.6.2;netstandard2.0;net5.0</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>

src/NLog.Targets.Seq/SeqTarget.cs

@@ -68,11 +68,16 @@ public sealed class SeqTarget : Target
         /// A Seq <i>API key</i> that authenticates the client to the Seq server.
         /// </summary>
         public string ApiKey { get => (_apiKey as SimpleLayout)?.Text; set => _apiKey = value ?? string.Empty; }
-        
+
         /// <summary>
         /// The address of the proxy to use, including port separated by a colon. If not provided, default operating system proxy will be used.
         /// </summary>
+        
         public string ProxyAddress { get => (_proxyAddress as SimpleLayout)?.Text; set => _proxyAddress = value ?? string.Empty; }
+        /// <summary>
+        /// Use default credentials
+        /// </summary>
+        public bool UseDefaultCredentials { get; set; }
 
         /// <summary>
         /// A list of properties that will be attached to the events.
@@ -91,7 +96,7 @@ public int MaxRecursionLimit
             get => TemplatedClefLayout.MaxRecursionLimit;
             set { TemplatedClefLayout.MaxRecursionLimit = value; TextClefLayout.MaxRecursionLimit = value; }
         }
-        
+
         /// <summary>
         /// Construct a <see cref="SeqTarget"/>.
         /// </summary>
@@ -102,7 +107,7 @@ public SeqTarget()
             OptimizeBufferReuse = true;
             JsonPayloadMaxLength = 128 * 1024;
         }
-        
+
         /// <summary>
         /// Initializes the target. Can be used by inheriting classes
         /// to initialize logging.
@@ -130,8 +135,19 @@ protected override void InitializeTarget()
 
                 var proxyAddress = _proxyAddress?.Render(LogEventInfo.CreateNullEvent()) ?? string.Empty;
                 if (!string.IsNullOrEmpty(proxyAddress))
-                    handler = new HttpClientHandler {Proxy = new WebProxy(new Uri(proxyAddress), true)};
-                
+                    handler = new HttpClientHandler { Proxy = new WebProxy(new Uri(proxyAddress), true) };
+                if (UseDefaultCredentials)
+                {
+                    if (handler != null)
+                    {
+                        handler.UseDefaultCredentials = UseDefaultCredentials;
+                    }
+                    else
+                    {
+                        handler = new HttpClientHandler { UseDefaultCredentials = UseDefaultCredentials };
+                    }
+                }
+
                 _httpClient = handler == null ? new HttpClient() : new HttpClient(handler);
             }
 
@@ -187,7 +203,7 @@ async Task PostBatch(IList<AsyncLogEventInfo> logEvents)
             var request = new HttpRequestMessage(HttpMethod.Post, _webRequestUri);
             if (!string.IsNullOrWhiteSpace(_headerApiKey))
                 request.Headers.Add(SeqApi.ApiKeyHeaderName, _headerApiKey);
-            
+
             List<AsyncLogEventInfo> extraBatch = null;
             var totalPayload = 0;
             var payload = new StringBuilder();
@@ -222,7 +238,7 @@ async Task PostBatch(IList<AsyncLogEventInfo> logEvents)
             }
 
             request.Content = new StringContent(payload.ToString(), Utf8, SeqApi.CompactLogEventFormatMediaType);
-            
+
             // Even if no events are above `_minimumLevel`, we'll send a batch to make sure we observe minimum
             // level changes sent by the server.