Merge pull request #1615 from tgstation/SqlClientChange

Switch to using `Microsoft.Data.SqlClient`
This commit is contained in:
Jordan Dominion
2023-07-27 21:50:36 -04:00
committed by GitHub
6 changed files with 8 additions and 10 deletions
@@ -1,7 +1,7 @@
using System;
using System.Data.Common;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using Microsoft.Data.Sqlite;
using MySqlConnector;
@@ -1,6 +1,6 @@
using System;
using System.Data.SqlClient;
using Microsoft.Data.SqlClient;
using Microsoft.EntityFrameworkCore;
using Tgstation.Server.Host.Configuration;
@@ -1,7 +1,6 @@
using System;
using System.Collections.Generic;
using System.Data.Common;
using System.Data.SqlClient;
using System.Globalization;
using System.IO;
using System.Linq;
@@ -11,6 +10,7 @@ using System.Text.RegularExpressions;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Data.SqlClient;
using Microsoft.Data.Sqlite;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Hosting;
@@ -110,8 +110,6 @@
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<!-- Usage: Newtonsoft.Json plugin for OpenAPI spec generator -->
<PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.5.0" />
<!-- Usage: Access to raw database connectors primarily for setup wizard -->
<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
<!-- Usage: Windows authentication plugin allowing searching for users by name -->
<PackageReference Include="System.DirectoryServices.AccountManagement" Version="7.0.0" />
<!-- Usage: JWT plugin needed to undo some Microsoft meddling in the HTTP pipeline -->
@@ -1,10 +1,10 @@
using Microsoft.VisualStudio.TestTools.UnitTesting;
using System;
using Microsoft.Data.SqlClient;
using Microsoft.VisualStudio.TestTools.UnitTesting;
using MySqlConnector;
using System;
using System.Data.SqlClient;
using Tgstation.Server.Host.Configuration;
namespace Tgstation.Server.Host.Database.Tests
@@ -1,6 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data.SqlClient;
using System.Diagnostics;
using System.IO;
using System.Linq;
@@ -14,6 +13,7 @@ using System.Reflection;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.Data.SqlClient;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Logging;
using Microsoft.VisualStudio.TestTools.UnitTesting;