From d9a9218a56e59778df525c5c281ad719ba5a79ec Mon Sep 17 00:00:00 2001
From: Rolf Kristensen <snakefoot@users.noreply.github.com>
Date: Thu, 30 Nov 2023 18:30:53 +0100
Subject: [PATCH] feat: updated nuget-dependencies and introduced
 IncludeEventProperties (#180)

---
 .../NLog.Targets.ElasticSearch.Tests.csproj         |  7 +++++--
 .../ElasticSearchTarget.cs                          | 13 ++++++++++---
 .../IElasticSearchTarget.cs                         |  9 ++++++++-
 .../NLog.Targets.ElasticSearch.csproj               | 10 +++++-----
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/NLog.Targets.ElasticSearch.Tests/NLog.Targets.ElasticSearch.Tests.csproj b/src/NLog.Targets.ElasticSearch.Tests/NLog.Targets.ElasticSearch.Tests.csproj
index d54632f..867ab24 100644
--- a/src/NLog.Targets.ElasticSearch.Tests/NLog.Targets.ElasticSearch.Tests.csproj
+++ b/src/NLog.Targets.ElasticSearch.Tests/NLog.Targets.ElasticSearch.Tests.csproj
@@ -6,8 +6,11 @@
 
   <ItemGroup>
     <ProjectReference Include="..\NLog.Targets.ElasticSearch\NLog.Targets.ElasticSearch.csproj" />
-    <PackageReference Include="xunit" Version="2.3.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs b/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs
index 0d66eba..4fa64d2 100644
--- a/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs
+++ b/src/NLog.Targets.ElasticSearch/ElasticSearchTarget.cs
@@ -145,12 +145,19 @@ public string CloudId
         public Layout Index { get; set; } = "logstash-${date:format=yyyy.MM.dd}";
 
         /// <summary>
+        /// Obsolete and replaced by <see cref="IncludeEventProperties"/> to match NLog naming convention.
         /// Gets or sets whether to include all properties of the log event in the document
         /// </summary>
-        public bool IncludeAllProperties { get; set; }
+        [Obsolete("Replaced by IncludeEventProperties")]
+        public bool IncludeAllProperties { get => IncludeEventProperties; set => IncludeEventProperties = value; }
 
         /// <summary>
-        /// Gets or sets a comma separated list of excluded properties when setting <see cref="IElasticSearchTarget.IncludeAllProperties"/>
+        /// Gets or sets whether to include LogEvent Properties in the document
+        /// </summary>
+        public bool IncludeEventProperties { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comma separated list of excluded properties when setting <see cref="IElasticSearchTarget.IncludeEventProperties"/>
         /// </summary>
         public string ExcludedProperties { get; set; }
 
@@ -506,7 +513,7 @@ private Dictionary<string, object> GenerateDocumentProperties(LogEventInfo logEv
                 }
             }
 
-            if (IncludeAllProperties && logEvent.HasProperties)
+            if (IncludeEventProperties && logEvent.HasProperties)
             {
                 foreach (var p in logEvent.Properties)
                 {
diff --git a/src/NLog.Targets.ElasticSearch/IElasticSearchTarget.cs b/src/NLog.Targets.ElasticSearch/IElasticSearchTarget.cs
index 08cfc6e..c27e3a2 100644
--- a/src/NLog.Targets.ElasticSearch/IElasticSearchTarget.cs
+++ b/src/NLog.Targets.ElasticSearch/IElasticSearchTarget.cs
@@ -92,12 +92,19 @@ public interface IElasticSearchTarget
         Layout Index { get; set; }
 
         /// <summary>
+        /// Obsolete and replaced by <see cref="IncludeEventProperties"/> to match NLog naming convention.
         /// Gets or sets whether to include all properties of the log event in the document
         /// </summary>
+        [Obsolete("Replaced by IncludeEventProperties")]
         bool IncludeAllProperties { get; set; }
 
         /// <summary>
-        /// Gets or sets a comma separated list of excluded properties when setting <see cref="IncludeAllProperties"/>
+        /// Gets or sets whether to include LogEvent Properties in the document
+        /// </summary>
+        bool IncludeEventProperties { get; set; }
+
+        /// <summary>
+        /// Gets or sets a comma separated list of excluded properties when setting <see cref="IncludeEventProperties"/>
         /// </summary>
         string ExcludedProperties { get; set; }
 
diff --git a/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj b/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj
index e2167f4..4767639 100644
--- a/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj
+++ b/src/NLog.Targets.ElasticSearch/NLog.Targets.ElasticSearch.csproj
@@ -14,10 +14,10 @@
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Elasticsearch.Net" Version="7.13.2" />
-    <PackageReference Include="NEST" Version="7.13.2" />
-    <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
-    <PackageReference Include="NLog" Version="4.6.8" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
+    <PackageReference Include="Elasticsearch.Net" Version="7.17.5" />
+    <PackageReference Include="NEST" Version="7.17.5" />
+    <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+    <PackageReference Include="NLog" Version="4.7.15" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
   </ItemGroup>
 </Project>
\ No newline at end of file