Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replaces usage of System.Data.SqlClient with Microsoft.Data.SqlClient #1436

Merged
merged 1 commit into from
May 6, 2021
Merged

Replaces usage of System.Data.SqlClient with Microsoft.Data.SqlClient #1436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/FluentMigrator.Runner.SqlServer/FluentMigrator.Runner.SqlServer.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
<ProjectReference Include="..\FluentMigrator.Extensions.SqlServer\FluentMigrator.Extensions.SqlServer.csproj" />
<ProjectReference Include="..\FluentMigrator.Runner.Core\FluentMigrator.Runner.Core.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Data.SqlClient">
<Version>4.4.3</Version>
<ItemGroup>
<PackageReference Include="Microsoft.Data.SqlClient">
<Version>2.1.2</Version>
</PackageReference>
</ItemGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServer2000Processor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Data.SqlClient;
using System.IO;

using FluentMigrator.Expressions;
Expand All @@ -53,6 +52,7 @@

using JetBrains.Annotations;

using Microsoft.Data.SqlClient;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
Expand Down
2 changes: 1 addition & 1 deletion src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServer2016Processor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

using System;
using System.Data.Common;
using System.Data.SqlClient;

using FluentMigrator.Runner.Generators.SqlServer;
using FluentMigrator.Runner.Initialization;

using JetBrains.Annotations;

using Microsoft.Data.SqlClient;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;

Expand Down
3 changes: 2 additions & 1 deletion src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServerDbFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,8 @@

using System;
using System.Data.Common;
using System.Data.SqlClient;

using Microsoft.Data.SqlClient;

namespace FluentMigrator.Runner.Processors.SqlServer
{
Expand Down
2 changes: 1 addition & 1 deletion src/FluentMigrator.Runner.SqlServer/Processors/SqlServer/SqlServerProcessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
using System.Collections.Generic;
using System.Data;
using System.Data.Common;
using System.Data.SqlClient;
using System.IO;
using System.Linq;

Expand All @@ -33,6 +32,7 @@

using JetBrains.Annotations;

using Microsoft.Data.SqlClient;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
Expand Down
2 changes: 1 addition & 1 deletion src/FluentMigrator.Runner.SqlServerCe/FluentMigrator.Runner.SqlServerCe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<ProjectReference Include="..\FluentMigrator.Runner.SqlServer\FluentMigrator.Runner.SqlServer.csproj" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="System.Security.Permissions" Version="4.4.1" />
<PackageReference Include="System.Security.Permissions" Version="4.7.0" />
</ItemGroup>
<ItemGroup>
<Content Include="../../lib/SQLServerCE4/amd64/**/*.*">
Expand Down
7 changes: 4 additions & 3 deletions test/FluentMigrator.Tests/Helpers/SqlServerTestSequence.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#region License
#region License
// Copyright (c) 2007-2018, Sean Chambers <schambers80@gmail.com>
//
// Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -15,9 +15,10 @@
#endregion

using System;
using System.Data.SqlClient;
using FluentMigrator.Runner.Processors.SqlServer;

using Microsoft.Data.SqlClient;

namespace FluentMigrator.Tests.Helpers
{
public class SqlServerTestSequence : IDisposable
Expand Down Expand Up @@ -77,4 +78,4 @@ public void Drop()
}
}
}
}
}
3 changes: 2 additions & 1 deletion test/FluentMigrator.Tests/Helpers/SqlServerTestTable.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@

using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Text;

using FluentMigrator.Runner.Generators;
using FluentMigrator.Runner.Processors.SqlServer;

using Microsoft.Data.SqlClient;

namespace FluentMigrator.Tests.Helpers
{
public class SqlServerTestTable : IDisposable
Expand Down
3 changes: 2 additions & 1 deletion test/FluentMigrator.Tests/Integration/ObsoleteIntegrationTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Diagnostics;
using System.IO;
using System.Linq;
Expand All @@ -40,6 +39,8 @@
using FluentMigrator.Runner.Generators.SqlAnywhere;
using FluentMigrator.Runner.Processors.SqlAnywhere;

using Microsoft.Data.SqlClient;

using MySql.Data.MySqlClient;

using Npgsql;
Expand Down
3 changes: 2 additions & 1 deletion test/FluentMigrator.Tests/Integration/ObsoleteMigrationRunnerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
using System;
using System.Collections.Generic;
using System.Data;
using System.Data.SqlClient;
using System.IO;
using System.Linq;
using System.Reflection;
Expand All @@ -44,6 +43,8 @@
using FluentMigrator.Tests.Integration.Migrations.Tagged;
using FluentMigrator.Tests.Unit;

using Microsoft.Data.SqlClient;

using Moq;

using NUnit.Framework;
Expand Down
2 changes: 1 addition & 1 deletion test/FluentMigrator.Tests/IssueTests/GH0911/Fixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@

using System;
using System.Data;
using System.Data.SqlClient;
using System.Linq;

using FluentMigrator.Runner;
using FluentMigrator.Runner.Initialization;
using FluentMigrator.Runner.VersionTableInfo;

using Microsoft.Data.SqlClient;
using Microsoft.Extensions.DependencyInjection;

using NUnit.Framework;
Expand Down