Skip to content

Commit aaa87ad

Browse files
committed
Removed obsolete .NET Framework 4.5.2 #ifdefs
1 parent d5ddcd6 commit aaa87ad

File tree

11 files changed

+8
-76
lines changed

11 files changed

+8
-76
lines changed

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -129,11 +129,7 @@ public Task EmitBatchAsync(IEnumerable<LogEvent> events) =>
129129
/// </summary>
130130
/// <returns>A completed task</returns>
131131
public Task OnEmptyBatchAsync() =>
132-
#if NET452
133-
Task.FromResult(false);
134-
#else
135132
Task.CompletedTask;
136-
#endif
137133

138134
/// <summary>
139135
/// Performs application-defined tasks associated with freeing, releasing, or resetting unmanaged resources.

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlClient/SqlBulkCopyWrapper.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
using System;
22
using System.Data;
33
using System.Threading.Tasks;
4-
#if NET452
5-
using System.Data.SqlClient;
6-
#else
74
using Microsoft.Data.SqlClient;
8-
#endif
95

106
namespace Serilog.Sinks.MSSqlServer.Platform.SqlClient
117
{

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlClient/SqlCommandWrapper.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
22
using System.Data;
3-
#if NET452
4-
using System.Data.SqlClient;
5-
#else
63
using Microsoft.Data.SqlClient;
7-
#endif
84

95
namespace Serilog.Sinks.MSSqlServer.Platform.SqlClient
106
{

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlClient/SqlConnectionStringBuilderWrapper.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
#if NET452
2-
using System.Data.SqlClient;
3-
#else
4-
using Microsoft.Data.SqlClient;
5-
#endif
1+
using Microsoft.Data.SqlClient;
62

73
namespace Serilog.Sinks.MSSqlServer.Platform.SqlClient
84
{

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlClient/SqlConnectionWrapper.cs

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
using System;
2-
#if NET452
3-
using System.Data.SqlClient;
4-
#else
5-
using Microsoft.Data.SqlClient;
6-
#endif
72
using System.Threading.Tasks;
3+
using Microsoft.Data.SqlClient;
84

95
namespace Serilog.Sinks.MSSqlServer.Platform.SqlClient
106
{
@@ -16,15 +12,7 @@ internal class SqlConnectionWrapper : ISqlConnectionWrapper
1612
public SqlConnectionWrapper(string connectionString, string accessToken)
1713
{
1814
_sqlConnection = new SqlConnection(connectionString);
19-
#if NET452
20-
if (accessToken != null)
21-
{
22-
throw new InvalidOperationException(
23-
$"SqlConnection access token is set target framework that does not support it. Refer to MSSQLServer sink documentation for details.");
24-
}
25-
#else
2615
_sqlConnection.AccessToken = accessToken;
27-
#endif
2816
}
2917

3018
public string ConnectionString => _sqlConnection.ConnectionString;

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlClient/SqlBulkCopyWrapperTests.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
using System;
2-
#if NET452
3-
using System.Data.SqlClient;
4-
#else
52
using Microsoft.Data.SqlClient;
6-
#endif
3+
using Xunit;
74
using Serilog.Sinks.MSSqlServer.Platform.SqlClient;
85
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
9-
using Xunit;
106

117
namespace Serilog.Sinks.MSSqlServer.Tests.Platform.SqlClient
128
{

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlClient/SqlCommandWrapperTests.cs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
using System;
2-
#if NET452
3-
using System.Data.SqlClient;
4-
#else
52
using Microsoft.Data.SqlClient;
6-
#endif
73
using Xunit;
84
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
95
using Serilog.Sinks.MSSqlServer.Platform.SqlClient;

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlClient/SqlConnectionStringBuilderWrapperTests.cs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
1-
#if NET452
2-
using System.Data.SqlClient;
3-
#else
4-
using Microsoft.Data.SqlClient;
5-
#endif
6-
using Xunit;
7-
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
1+
using Xunit;
82
using Serilog.Sinks.MSSqlServer.Platform.SqlClient;
9-
using System;
3+
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
104

115
namespace Serilog.Sinks.MSSqlServer.Tests.Platform.SqlClient
126
{

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlClient/SqlConnectionWrapperTests.cs

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,12 @@
1-
#if NET452
2-
using System.Data.SqlClient;
3-
#else
4-
using Microsoft.Data.SqlClient;
5-
#endif
6-
using Xunit;
1+
using Xunit;
72
using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
83
using Serilog.Sinks.MSSqlServer.Platform.SqlClient;
9-
using System;
104

115
namespace Serilog.Sinks.MSSqlServer.Tests.Platform.SqlClient
126
{
137
[Trait(TestCategory.TraitName, TestCategory.Unit)]
148
public class SqlConnectionWrapperTests
159
{
16-
[Fact]
17-
public void InitializeThrowsIfCalledWithAuthenticationTokenOnDotNetFramework452ButNotOnOtherTargets()
18-
{
19-
#if NET452
20-
Assert.Throws<InvalidOperationException>(() => new SqlConnectionWrapper(DatabaseFixture.LogEventsConnectionString, "AuthenticationToken"));
21-
#else
22-
// Should not throw
23-
using (_ = new SqlConnectionWrapper(@"Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=Master", "AuthenticationToken"))
24-
{ }
25-
#endif
26-
}
27-
2810
[Fact]
2911
public void CreateCommandReturnsSqlCommandWrapper()
3012
{

test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseFixture.cs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
using System;
2-
#if NET452
3-
using System.Data.SqlClient;
4-
#else
5-
using Microsoft.Data.SqlClient;
6-
#endif
72
using System.Globalization;
83
using System.Linq;
94
using Dapper;
5+
using Microsoft.Data.SqlClient;
106

117
namespace Serilog.Sinks.MSSqlServer.Tests.TestUtils
128
{

0 commit comments

Comments
 (0)