Merged from upstream (serilog/dev).

ckadluba · ckadluba · commit c5461363205b · 2020-05-21T20:51:18.000+02:00
diff --git a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj
@@ -55,7 +55,7 @@
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
     <Compile Include="Configuration\Extensions\Microsoft.Extensions.Configuration\**\*.cs" />
@@ -65,7 +65,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' Or '$(TargetFramework)' == 'net461' ">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.4.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
     <Compile Include="Configuration\Extensions\Hybrid\**\*.cs" />
@@ -76,7 +76,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.2' Or '$(TargetFramework)' == 'net472' ">
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
-    <PackageReference Include="System.Data.SqlClient" Version="4.6.0" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.3" />
     <PackageReference Include="Microsoft.Azure.Services.AppAuthentication" Version="1.4.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="2.0.0" />
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Microsoft.Azure.Services.AppAuthentication;
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorStub.cs
@@ -1,5 +1,10 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
+
 using System.Diagnostics.CodeAnalysis;
 
 // This is an empty stub implementaion of IAzureManagedServiceAuthenticator for the target frameworks
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/IAzureManagedServiceAuthenticator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/IAzureManagedServiceAuthenticator.cs
@@ -1,9 +1,13 @@
-﻿using System.Data.SqlClient;
+﻿#if NET452
+using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
 {
     internal interface IAzureManagedServiceAuthenticator
     {
         void SetAuthenticationToken(SqlConnection sqlConnection);
     }
-}
+}
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs
@@ -1,4 +1,6 @@
-﻿namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
+﻿using System.Data.SqlClient;
+
+namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
 {
     internal interface ISqlConnectionFactory
     {
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionWrapper.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionWrapper.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Threading.Tasks;
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlBulkBatchWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlBulkBatchWriter.cs
@@ -1,7 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Data;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCommandWrapper.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCommandWrapper.cs
@@ -1,7 +1,11 @@
 ﻿using System;
 using System.Data;
 using System.Data.Common;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
 {
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlConnectionFactory.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlConnectionFactory.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
 {
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlConnectionWrapper.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlConnectionWrapper.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Threading.Tasks;
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs
@@ -1,6 +1,10 @@
 ﻿using System;
 using System.Data;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Text;
 using Serilog.Debugging;
 using Serilog.Events;
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlTableCreator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlTableCreator.cs
@@ -1,6 +1,10 @@
 ﻿using System;
 using System.Data;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Serilog.Debugging;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 
diff --git a/src/Serilog.Sinks.MSSqlServer/packages.config b/src/Serilog.Sinks.MSSqlServer/packages.config
@@ -2,4 +2,5 @@
 <packages>
   <package id="Serilog" version="2.5.0" targetFramework="net452" />
   <package id="Serilog.Sinks.PeriodicBatching" version="2.1.1" targetFramework="net452" />
+  <package id="System.Data.SqlClient" Version="4.6.0" targetFramework="net452" />
 </packages>
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/CustomStandardColumnNamesTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/CustomStandardColumnNamesTests.cs
@@ -1,6 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.IO;
 using Dapper;
 using FluentAssertions;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/IndexingFeaturesTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/IndexingFeaturesTests.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Linq;
 using Dapper;
 using FluentAssertions;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/LevelAsEnumTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/LevelAsEnumTests.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.IO;
 using Dapper;
 using FluentAssertions;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/MiscFeaturesTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/MiscFeaturesTests.cs
@@ -1,7 +1,11 @@
 ﻿using System;
 using System.Collections.Generic;
 using System.Data;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Linq;
 using Dapper;
 using FluentAssertions;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/PropertiesColumnFilteringTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/PropertiesColumnFilteringTests.cs
@@ -1,4 +1,8 @@
-﻿using System.Data.SqlClient;
+﻿#if NET452
+using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Dapper;
 using FluentAssertions;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorTests.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Microsoft.Azure.Services.AppAuthentication;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlTableCreatorTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlTableCreatorTests.cs
@@ -1,5 +1,9 @@
 ﻿using System.Data;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Dapper;
 using FluentAssertions;
 using Moq;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseFixture.cs b/test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseFixture.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Globalization;
 using System.Linq;
 using Dapper;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseTestsBase.cs b/test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseTestsBase.cs
@@ -1,6 +1,10 @@
 ﻿using System;
 using System.Collections.Generic;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using System.Globalization;
 using System.Linq;
 using Dapper;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/TimeStampTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/TimeStampTests.cs
@@ -1,6 +1,10 @@
 ﻿using System;
 using System.Data;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Dapper;
 using FluentAssertions;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/TriggersOnLogTableTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/TriggersOnLogTableTests.cs
@@ -1,5 +1,9 @@
 ﻿using System;
+#if NET452
 using System.Data.SqlClient;
+#else
+using Microsoft.Data.SqlClient;
+#endif
 using Dapper;
 using FluentAssertions;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,13 @@`
`1`		`-using System.Data.SqlClient;`
	`1`	`+#if NET452`
	`2`	`+using System.Data.SqlClient;`
	`3`	`+#else`
	`4`	`+using Microsoft.Data.SqlClient;`
	`5`	`+#endif`
`2`	`6`
`3`	`7`	`namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform`
`4`	`8`	`{`
`5`	`9`	`internal interface IAzureManagedServiceAuthenticator`
`6`	`10`	`{`
`7`	`11`	`void SetAuthenticationToken(SqlConnection sqlConnection);`
`8`	`12`	`}`
`9`		`-}`
	`13`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform`
	`1`	`+using System.Data.SqlClient;`
	`2`	`+`
	`3`	`+namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform`
`2`	`4`	`{`
`3`	`5`	`internal interface ISqlConnectionFactory`
`4`	`6`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`	`1`	`using System;`
	`2`	`+#if NET452`
`2`	`3`	`using System.Data.SqlClient;`
	`4`	`+#else`
	`5`	`+using Microsoft.Data.SqlClient;`
	`6`	`+#endif`
`3`	`7`
`4`	`8`	`namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform`
`5`	`9`	`{`