diff --git a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj index c0612ca3..61e555a4 100644 --- a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj +++ b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj @@ -55,7 +55,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -76,7 +76,7 @@ - + diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticator.cs index 9cf477f2..2f997d52 100644 --- 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 index 61a8b98e..2a9ae69e 100644 --- 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 index 89b59643..02edd660 100644 --- a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/IAzureManagedServiceAuthenticator.cs +++ b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/IAzureManagedServiceAuthenticator.cs @@ -1,4 +1,8 @@ -using System.Data.SqlClient; +#if NET452 +using System.Data.SqlClient; +#else +using Microsoft.Data.SqlClient; +#endif namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform { @@ -6,4 +10,4 @@ internal interface IAzureManagedServiceAuthenticator { void SetAuthenticationToken(SqlConnection sqlConnection); } -} \ No newline at end of file +} diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs index 541d8863..5cf07873 100644 --- a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs +++ b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlConnectionFactory.cs @@ -1,4 +1,8 @@ -using System.Data.SqlClient; +#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/SqlBulkBatchWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlBulkBatchWriter.cs index ef1dc5de..dc37d53b 100644 --- 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/SqlConnectionFactory.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlConnectionFactory.cs index de806330..6f65aeb7 100644 --- 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/SqlLogEventWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs index 40a8fd94..0756e140 100644 --- 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 index 3968d9c0..1686d6a4 100644 --- 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 index 4bb6d6db..a9f2d088 100644 --- a/src/Serilog.Sinks.MSSqlServer/packages.config +++ b/src/Serilog.Sinks.MSSqlServer/packages.config @@ -2,4 +2,5 @@ + diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/AzureManagedServiceAuthenticatorTests.cs index f5d557f0..3f1c96e5 100644 --- 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 index 6a12e6e8..e4c526c2 100644 --- 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;