Added in changes from 1.2.0 (#111)

* Added in changes from 1.2.0

* Remove extra lines

* Fixed bug in implementation

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+
+
+## [NLog_v1.2.1]
 ### Features
 - Adds optional support for sending the MappedDiagnosticsContext and MappedDiagnosticsLogicalContext to New Relic One for NLog.
 

src/NewRelic.LogEnrichers.NLog/NewRelicJsonLayout.cs

@@ -62,7 +62,8 @@ internal NewRelicJsonLayout(Func<NewRelic.Api.Agent.IAgent> agentFactory)
             // that look like message.property.ErrorMessage in the UI.
             _jsonLayoutForMessageProperties = new JsonLayout()
             {
-                // IncludeGdc = false, GDC not supported in NLog 4.5
+                // GDC is not supported in NLog 4.5
+                // This is an internal attribute that sets up message.properties.  Explicitly excludes MDC/MDLC (and GDC if we ere on new NLog) content since that is handled differently.
                 IncludeAllProperties = true,
                 IncludeMdc = false,
                 IncludeMdlc = false,
@@ -92,7 +93,7 @@ protected override void InitializeLayout()
             // to the data, in a similar manner to how they would have added data via custom layout strings.
             // By default we will only support the data directly related to structured logging.
             // Note that any message properties will also be present in the Gdc, Mdc, and Mdlc contexts.
-            // IncludeGdc = false; // GDC not supported in NLog 4.5 - customers can enable it themselves in later versions however
+            // Customers can enable GDC themselves in later versions of NLog
             RenderEmptyObject = false;
             SuppressSpaces = true;
         }

tests/NewRelic.LogEnrichers.NLog.Tests/NewRelic.LogEnrichers.NLog.Tests.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>NewRelic.LogEnrichers.NLog.Tests</AssemblyName>
     <RootNamespace>NewRelic.LogEnrichers.NLog.Tests</RootNamespace>
   </PropertyGroup>