Use Microsoft.EntityFramework.SqlServer with the modern SqlClient

Directory.Packages.props

@@ -23,7 +23,7 @@
     <PackageVersion Include="CommonMark.NET" Version="0.15.1" />
     <PackageVersion Include="CsvHelper" Version="7.1.1" />
     <PackageVersion Include="d3" Version="5.4.0" />
-    <PackageVersion Include="Dapper.StrongName" Version="1.50.2" />
+    <PackageVersion Include="Dapper.StrongName" Version="2.1.66" />
     <PackageVersion Include="dotNetRDF" Version="1.0.8.3533" />
     <PackageVersion Include="EntityFramework" Version="6.5.1" />
     <PackageVersion Include="FluentAssertions" Version="5.5.0" />
@@ -63,6 +63,8 @@
     <PackageVersion Include="Microsoft.CodeDom.Providers.DotNetCompilerPlatform" Version="3.6.0" />
     <PackageVersion Include="Microsoft.Data.Services.Client" Version="5.8.4" />
     <PackageVersion Include="Microsoft.Data.Services" Version="5.8.4" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.1.6" />
+    <PackageVersion Include="Microsoft.EntityFramework.SqlServer" Version="6.5.1" />
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.CommandLineUtils" Version="1.1.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
@@ -134,7 +136,6 @@
     <PackageVersion Include="Strathweb.CacheOutput.WebApi2.StrongName" Version="0.9.0" />
     <PackageVersion Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageVersion Include="System.ComponentModel.EventBasedAsync" Version="4.0.11" />
-    <PackageVersion Include="System.Data.SqlClient" Version="4.8.6" />
     <PackageVersion Include="System.Diagnostics.Debug" Version="4.3.0" />
     <PackageVersion Include="System.Drawing.Common" Version="9.0.0" />
     <PackageVersion Include="System.Formats.Asn1" Version="8.0.2" />

src/ArchivePackages/ArchivePackages.Job.cs

@@ -4,13 +4,13 @@
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using Autofac;
 using Dapper;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;

src/Catalog/Helpers/GalleryDatabaseQueryService.cs

@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using NuGet.Services.Sql;
 
 namespace NuGet.Services.Metadata.Catalog.Helpers
@@ -289,4 +289,4 @@ private async Task<IReadOnlyCollection<FeedPackageDetails>> ReadPackagesAsync(Sq
             return packages;
         }
     }
-}
+}

src/DatabaseMigrationTools/DatabaseMigrationTools.csproj

@@ -7,7 +7,7 @@
     <Description>Database migration tools for NuGet Gallery/Support Requests/Validation databases</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EntityFramework" />
+    <PackageReference Include="Microsoft.EntityFramework.SqlServer" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NuGet.Services.DatabaseMigration\NuGet.Services.DatabaseMigration.csproj" />

src/DatabaseMigrationTools/GalleryDbMigrationContext.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Data.Entity.Migrations;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using NuGet.Services.DatabaseMigration;
 using NuGetGallery.Migrations;
 

src/DatabaseMigrationTools/SupportRequestDbMigrationContext.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Data.Entity.Migrations;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using NuGet.Services.DatabaseMigration;
 using NuGetGallery.Areas.Admin;
 using NuGetGallery.Areas.Admin.Models;

src/DatabaseMigrationTools/ValidationDbMigrationContext.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Data.Entity.Migrations;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using NuGet.Services.DatabaseMigration;
 using NuGet.Services.Validation;
 
@@ -26,4 +26,4 @@ public ValidationDbMigrationContext(SqlConnection sqlConnection)
             GetDbMigrator = () => new DbMigrator(migrationsConfiguration, new ValidationEntitiesContext(SqlConnection));
         }
     }
-}
+}

src/Gallery.CredentialExpiration/GalleryCredentialExpiration.cs

@@ -1,12 +1,12 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
 using Gallery.CredentialExpiration.Models;
+using Microsoft.Data.SqlClient;
 using NuGet.Jobs.Configuration;
 
 namespace Gallery.CredentialExpiration

src/Gallery.Maintenance/DeleteExpiredVerificationKeysTask.cs

@@ -1,13 +1,13 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
 using Gallery.Maintenance.Models;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NuGet.Jobs.Configuration;
 

src/GalleryTools/Commands/BackfillCommand.cs

@@ -1,4 +1,4 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using Autofac;
@@ -13,7 +13,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data.Entity;
-using System.Data.SqlClient;
 using System.IO;
 using System.Linq;
 using System.Linq.Expressions;
@@ -23,6 +22,7 @@
 using System.Xml;
 using System.Xml.Linq;
 using GalleryTools.Utils;
+using Microsoft.Data.SqlClient;
 using NuGet.Services.Sql;
 using NuGet.Packaging.Core;
 using NuGet.Versioning;

src/GalleryTools/Commands/UpdateIsLatestCommand.cs

@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.CommandLineUtils;
 using NuGet.Services.Entities;
 using NuGetGallery;

src/NuGet.Jobs.Common/DelegateSqlConnectionFactory.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Data.SqlClient;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NuGet.Jobs.Configuration;
 

src/NuGet.Jobs.Common/Extensions/DapperExtensions.cs

@@ -1,13 +1,15 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using System.Collections.Generic;
+using System.Data;
 using System.Threading.Tasks;
 using Dapper;
 using NuGet.Jobs;
 
 // ReSharper disable once CheckNamespace
-namespace System.Data.SqlClient
+namespace Microsoft.Data.SqlClient
 {
     public static class DapperExtensions
     {
@@ -49,4 +51,4 @@ public static Task<T> ExecuteScalarWithRetryAsync<T>(
                 maxRetries);
         }
     }
-}
+}

src/NuGet.Jobs.Common/ISqlConnectionFactory.cs

@@ -1,7 +1,7 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading.Tasks;
 using NuGet.Jobs.Configuration;
 

src/NuGet.Jobs.Common/JobBase.cs

@@ -1,12 +1,12 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.ComponentModel.Design;
-using System.Data.SqlClient;
 using System.Diagnostics.Tracing;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;

src/NuGet.Jobs.Common/NuGet.Jobs.Common.csproj

@@ -17,7 +17,7 @@
     <PackageReference Include="Dapper.StrongName" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" />
-    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">

src/NuGet.Jobs.Common/SqlRetryUtility.cs

@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
-using System.Data.SqlClient;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 
 namespace NuGet.Jobs
 {

src/NuGet.Services.AzureSearch/DatabaseAuxiliaryDataFetcher.cs

@@ -1,14 +1,14 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.Data;
 using System.Data.Entity;
-using System.Data.SqlClient;
 using System.Diagnostics;
 using System.Linq;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NuGet.Jobs;
 using NuGet.Jobs.Configuration;

src/NuGet.Services.DatabaseMigration/BaseDbMigrationContext.cs

@@ -1,10 +1,10 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Data;
 using System.Data.Entity.Migrations;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace NuGet.Services.DatabaseMigration
 {

src/NuGet.Services.DatabaseMigration/IMigrationContext.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Data.Entity.Migrations;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace NuGet.Services.DatabaseMigration
 {

src/NuGet.Services.DatabaseMigration/Job.cs

@@ -1,15 +1,15 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Linq;
-using System.Data.SqlClient;
 using System.Threading.Tasks;
 using System.Data.Entity.Migrations;
 using System.Data.Entity.Migrations.Infrastructure;
 using System.ComponentModel.Design;
 using System.Collections.Generic;
 using Autofac;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;

src/NuGet.Services.DatabaseMigration/NuGet.Services.DatabaseMigration.csproj

@@ -7,8 +7,8 @@
     <Description>Core support library for NuGet database migration</Description>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="EntityFramework" />
-    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="Microsoft.EntityFramework.SqlServer" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\NuGet.Jobs.Common\NuGet.Jobs.Common.csproj" />

src/NuGet.Services.Entities/Extensions/ExceptionExtensions.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace NuGet.Services.Entities
 {

src/NuGet.Services.Entities/NuGet.Services.Entities.csproj

@@ -11,7 +11,7 @@
     <PackageReference Include="NuGet.Frameworks" />
     <PackageReference Include="System.ComponentModel.Annotations" />
     <!-- This was lifted to a top-level dependency to resolve a Component Governance alert. -->
-    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
 
   <ItemGroup>

src/NuGet.Services.Revalidate/Initialization/PackageRevalidationInserter.cs

@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NuGet.Jobs;
 using NuGet.Jobs.Configuration;

src/NuGet.Services.Sql/AzureSqlConnectionFactory.cs

@@ -1,9 +1,9 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
-using System.Data.SqlClient;
 using System.Threading.Tasks;
+using Microsoft.Data.SqlClient;
 using Microsoft.Extensions.Logging;
 using NuGet.Services.KeyVault;
 

src/NuGet.Services.Sql/AzureSqlConnectionStringBuilder.cs

@@ -1,11 +1,11 @@
-// Copyright (c) .NET Foundation. All rights reserved.
+// Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
 using System.ComponentModel;
 using System.Data.Common;
-using System.Data.SqlClient;
 using System.Globalization;
+using Microsoft.Data.SqlClient;
 
 namespace NuGet.Services.Sql
 {