diff --git a/.editorconfig b/.editorconfig
index 39e87f8d..aa0ea6b3 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -76,5 +76,4 @@ dotnet_naming_symbols.public_constant_static_fields.required_modifiers = const,
dotnet_naming_style.pascal_case.capitalization = pascal_case
dotnet_sort_system_directives_first = true
-dotnet_style_require_accessibility_modifiers = always:error
-
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:error
diff --git a/CHANGES.md b/CHANGES.md
index 3c68729d..828a0cce 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,10 @@
+# 8.2.1
+* Updated SqlClient to 5.2.3 (thanks to @cancakar35)
+* Fixes in .editorconfig (thanks to @cancakar35)
+* Convert AppConfigDemo to SDK style (thanks to @cancakar35)
+* Removed obsolete SourceLink package references
+* Small code style fixes
+
# 8.2.0
* Added `ConnectionConfiguration` sink option to customize SqlConnection before use (thanks to @nhart12)
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 1b575644..ea880d78 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -6,12 +6,11 @@
-
+
-
@@ -22,4 +21,4 @@
-
\ No newline at end of file
+
diff --git a/README.md b/README.md
index 686abcc4..e9a7091a 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
A Serilog sink that writes events to Microsoft SQL Server. This sink will write the log event data to a table and can optionally also store the properties inside an XML or JSON column so they can be queried. Important properties can also be written to their own separate columns.
**Package** - [Serilog.Sinks.MSSqlServer](http://nuget.org/packages/serilog.sinks.mssqlserver)
-| **Minimum Platforms** - .NET Framework 4.6.2, .NET 6.0, .NET Standard 2.0
+| **Minimum Platforms** - .NET Framework 4.6.2, .NET 8.0, .NET Standard 2.0
#### Topics
diff --git a/sample/AppConfigDemo/App.config b/sample/AppConfigDemo/App.config
index 39b41390..5832773a 100644
--- a/sample/AppConfigDemo/App.config
+++ b/sample/AppConfigDemo/App.config
@@ -3,9 +3,6 @@
-
-
-
diff --git a/sample/AppConfigDemo/AppConfigDemo.csproj b/sample/AppConfigDemo/AppConfigDemo.csproj
index 5d6579f1..9dd1304e 100644
--- a/sample/AppConfigDemo/AppConfigDemo.csproj
+++ b/sample/AppConfigDemo/AppConfigDemo.csproj
@@ -1,71 +1,9 @@
-
-
-
+
- Debug
- AnyCPU
- {6BFE1D21-1442-4375-AB69-14160B906A64}
+ net462
Exe
- AppConfigDemo
- AppConfigDemo
- v4.6.2
- 512
- true
- true
-
- AnyCPU
- true
- full
- false
- bin\Debug\
- DEBUG;TRACE
- prompt
- 4
-
-
- AnyCPU
- pdbonly
- true
- bin\Release\
- TRACE
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {803cd13a-d54b-4cec-a55f-e22ae3d93b3c}
- Serilog.Sinks.MSSqlServer
-
-
-
+
-
diff --git a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj
index d4a75b91..8cccba2a 100644
--- a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj
+++ b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj
@@ -2,7 +2,7 @@
A Serilog sink that writes events to Microsoft SQL Server and Azure SQL
- 8.2.0
+ 8.2.1
true
8.0.0
Michiel van Oudheusden;Christian Kadluba;Serilog Contributors
@@ -33,7 +33,6 @@
-
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Output/XmlPropertyFormatter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Output/XmlPropertyFormatter.cs
index 98551e09..7adc2003 100644
--- a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Output/XmlPropertyFormatter.cs
+++ b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Output/XmlPropertyFormatter.cs
@@ -9,7 +9,7 @@ namespace Serilog.Sinks.MSSqlServer.Output
{
internal class XmlPropertyFormatter : IXmlPropertyFormatter
{
- private static readonly Regex _invalidXMLChars = new Regex(
+ private static readonly Regex _invalidXmlChars = new Regex(
@"(? "\\u" + ((ushort)m.Value[0]).ToString("x4", CultureInfo.InvariantCulture))).ToString();
+ return new XText(_invalidXmlChars.Replace(value.ToString(), m => "\\u" + ((ushort)m.Value[0]).ToString("x4", CultureInfo.InvariantCulture))).ToString();
}
private string SimplifyDictionary(ColumnOptions.PropertiesColumnOptions options, DictionaryValue dict)
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCreateTableWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCreateTableWriter.cs
index 12fe0581..e1ce1026 100644
--- a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCreateTableWriter.cs
+++ b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCreateTableWriter.cs
@@ -48,7 +48,7 @@ public string GetSql()
{
var common = (SqlColumn)column.ExtendedProperties["SqlColumn"];
- sql.Append(GetColumnDDL(common));
+ sql.Append(GetColumnDdl(common));
if (dataTable.Columns.Count > i++) sql.Append(',');
sql.AppendLine();
@@ -84,7 +84,7 @@ public string GetSql()
// Examples of possible output:
// [Id] BIGINT IDENTITY(1,1) NOT NULL
// [Message] VARCHAR(1024) NULL
- private static string GetColumnDDL(SqlColumn column)
+ private static string GetColumnDdl(SqlColumn column)
{
var sb = new StringBuilder();