Skip to content

Commit 2bfc317

Browse files
authored
chore: Update latest tested version of Microsoft.Data.SqlClient to 5.2.1 (#2525)
* Update latest tested version of Microsoft.Data.SqlClient * Add back tests for core latest for MS.Data.SqlClient
1 parent bbde084 commit 2bfc317

File tree

6 files changed

+54
-7
lines changed

6 files changed

+54
-7
lines changed

tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@
6060
<PackageReference Include="Microsoft.Data.SqlClient" Version="1.0.19239.1" Condition="'$(TargetFramework)' == 'net462'" />
6161
<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.5" Condition="'$(TargetFramework)' == 'net471'" />
6262
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" Condition="'$(TargetFramework)' == 'net48'" />
63-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" Condition="'$(TargetFramework)' == 'net481'" />
63+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" Condition="'$(TargetFramework)' == 'net481'" />
6464
<PackageReference Include="Microsoft.Data.SqlClient" Version="3.1.1" Condition="'$(TargetFramework)' == 'net6.0'" />
65-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" Condition="'$(TargetFramework)' == 'net8.0'" />
65+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" Condition="'$(TargetFramework)' == 'net8.0'" />
6666

6767
<!-- MySql.Data framework references -->
6868
<PackageReference Include="MySql.Data" Version="6.10.7" Condition="'$(TargetFramework)' == 'net462'" />

tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/NetStandardLibraries/MsSql/MicrosoftDataSqlClientExerciser.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// Copyright 2020 New Relic, Inc. All rights reserved.
22
// SPDX-License-Identifier: Apache-2.0
33

4-
#if !NET8_0_OR_GREATER
5-
64
using System.Collections.Generic;
75
using System.Linq;
86
using System.Runtime.CompilerServices;
@@ -278,5 +276,3 @@ private void EnsureProcedure(string procedureName, DbParameter[] dbParameters)
278276
}
279277
}
280278
}
281-
282-
#endif

tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlQueryParamTests.cs

+26
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,19 @@ public MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_FW462(ConsoleDynami
292292
}
293293
}
294294

295+
[NetCoreTest]
296+
public class MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreLatest : MsSqlQueryParamTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
297+
{
298+
public MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
299+
: base(
300+
fixture: fixture,
301+
output: output,
302+
excerciserName: "MicrosoftDataSqlClientExerciser",
303+
paramsWithAtSign: true)
304+
{
305+
}
306+
}
307+
295308
[NetCoreTest]
296309
public class MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreOldest : MsSqlQueryParamTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
297310
{
@@ -305,6 +318,19 @@ public MsSqlQueryParamTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMeth
305318
}
306319
}
307320

321+
[NetCoreTest]
322+
public class MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_CoreLatest : MsSqlQueryParamTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
323+
{
324+
public MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
325+
: base(
326+
fixture: fixture,
327+
output: output,
328+
excerciserName: "MicrosoftDataSqlClientExerciser",
329+
paramsWithAtSign: false)
330+
{
331+
}
332+
}
333+
308334
[NetCoreTest]
309335
public class MsSqlQueryParamTests_MicrosoftDataSqlClient_NoAtSigns_CoreOldest : MsSqlQueryParamTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
310336
{

tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlStoredProcedureTests.cs

+12
Original file line numberDiff line numberDiff line change
@@ -194,6 +194,18 @@ public MsSqlStoredProcedureTests_MicrosoftDataSqlClient_FW462(ConsoleDynamicMeth
194194
}
195195
}
196196

197+
[NetCoreTest]
198+
public class MsSqlStoredProcedureTests_MicrosoftDataSqlClient_CoreLatest : MsSqlStoredProcedureTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
199+
{
200+
public MsSqlStoredProcedureTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
201+
: base(
202+
fixture: fixture,
203+
output: output,
204+
excerciserName: "MicrosoftDataSqlClientExerciser")
205+
{
206+
}
207+
}
208+
197209
[NetCoreTest]
198210
public class MsSqlStoredProcedureTests_MicrosoftDataSqlClient_CoreOldest : MsSqlStoredProcedureTestsBase<ConsoleDynamicMethodFixtureCoreOldest>
199211
{

tests/Agent/IntegrationTests/UnboundedIntegrationTests/MsSql/MsSqlTests.cs

+13
Original file line numberDiff line numberDiff line change
@@ -312,4 +312,17 @@ public MsSqlTests_MicrosoftDataSqlClient_CoreOldest(ConsoleDynamicMethodFixtureC
312312
{
313313
}
314314
}
315+
316+
[NetCoreTest]
317+
public class MsSqlTests_MicrosoftDataSqlClient_CoreLatest : MsSqlTestsBase<ConsoleDynamicMethodFixtureCoreLatest>
318+
{
319+
public MsSqlTests_MicrosoftDataSqlClient_CoreLatest(ConsoleDynamicMethodFixtureCoreLatest fixture, ITestOutputHelper output)
320+
: base(
321+
fixture: fixture,
322+
output: output,
323+
excerciserName: "MicrosoftDataSqlClientExerciser",
324+
libraryName: "Microsoft.Data.SqlClient")
325+
{
326+
}
327+
}
315328
}

tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
</Content>
4242
</ItemGroup>
4343
<ItemGroup>
44-
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
44+
<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.1" />
4545
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
4646
<PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" Version="17.10.48">
4747
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
 (0)