Release 8.2.1

.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

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)
 

Directory.Packages.props

@@ -6,12 +6,11 @@
     <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.2" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.3" />
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="coverlet.collector" Version="3.2.0" />
     <PackageVersion Include="FluentAssertions" Version="6.12.1" />
     <PackageVersion Include="Dapper.StrongName" Version="2.1.35" />
@@ -22,4 +21,4 @@
     <PackageVersion Include="Serilog.Extensions.Hosting" Version="8.0.0" />
     <PackageVersion Include="Serilog.Settings.Configuration" Version="8.0.4" />
   </ItemGroup>
-</Project>
+</Project>

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
 

sample/AppConfigDemo/App.config

@@ -3,9 +3,6 @@
   <configSections>
     <section name="MSSqlServerSettingsSection" type="Serilog.Configuration.MSSqlServerConfigurationSection, Serilog.Sinks.MSSqlServer" />
   </configSections>
-  <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
-  </startup>
   <MSSqlServerSettingsSection>
 
     <BatchPostingLimit Value="13" />

sample/AppConfigDemo/AppConfigDemo.csproj

@@ -1,71 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6BFE1D21-1442-4375-AB69-14160B906A64}</ProjectGuid>
+    <TargetFramework>net462</TargetFramework>
     <OutputType>Exe</OutputType>
-    <RootNamespace>AppConfigDemo</RootNamespace>
-    <AssemblyName>AppConfigDemo</AssemblyName>
-    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions" />
-    <Reference Include="Microsoft.Extensions.Primitives" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Serilog" />
-    <Reference Include="System" />
-    <Reference Include="System.Buffers" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Diagnostics.DiagnosticSource" />
-    <Reference Include="System.Memory" />
-    <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors" />
-    <Reference Include="System.Runtime.CompilerServices.Unsafe" />
-    <Reference Include="System.Threading.Channels" />
-    <Reference Include="System.Threading.Tasks.Extensions" />
-    <Reference Include="System.ValueTuple" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj">
-      <Project>{803cd13a-d54b-4cec-a55f-e22ae3d93b3c}</Project>
-      <Name>Serilog.Sinks.MSSqlServer</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
-    <Folder Include="Properties\" />
+    <ProjectReference Include="..\..\src\Serilog.Sinks.MSSqlServer\Serilog.Sinks.MSSqlServer.csproj" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A Serilog sink that writes events to Microsoft SQL Server and Azure SQL</Description>
-    <VersionPrefix>8.2.0</VersionPrefix>
+    <VersionPrefix>8.2.1</VersionPrefix>
     <EnablePackageValidation>true</EnablePackageValidation>
     <PackageValidationBaselineVersion>8.0.0</PackageValidationBaselineVersion>
     <Authors>Michiel van Oudheusden;Christian Kadluba;Serilog Contributors</Authors>
@@ -33,7 +33,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" />
     <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.Extensions.Configuration" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />

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(
             @"(?<![\uD800-\uDBFF])[\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|[\x00-\x08\x0B\x0C\x0E-\x1F\x7F-\x9F\uFEFF\uFFFE\uFFFF]",
             RegexOptions.Compiled);
 
@@ -61,7 +61,7 @@ private static string SimplifyScalar(object value)
         {
             if (value == null) return null;
 
-            return new XText(_invalidXMLChars.Replace(value.ToString(), m => "\\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)

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();