From 8c63305f63d492a6ec9f58365676e5f84f51f0a9 Mon Sep 17 00:00:00 2001
From: Tatsuro Shibamura <me@shibayan.jp>
Date: Sat, 28 Jan 2023 17:08:52 +0900
Subject: [PATCH] Changed to use Microsoft SqlClient Data Provider (#61)

* Changed to use Microsoft SqlClient Data Provider

* Update to latest `Microsoft.Data.SqlClient` version

---------

Co-authored-by: Steve Molloy <smolloy@microsoft.com>
---
 ...nState.SqlSessionStateProviderAsync.csproj |  5 ++
 .../SqlCommandExtension.cs                    |  2 +-
 .../SqlCommandHelper.cs                       |  2 +-
 .../SqlInMemoryTableSessionStateRepository.cs |  2 +-
 .../SqlParameterCollectionExtension.cs        |  2 +-
 .../SqlSessionStateRepository.cs              |  2 +-
 .../SqlSessionStateRepositoryUtil.cs          |  4 +-
 ...e.SqlSessionStateProviderAsync.Test.csproj | 68 +++++++------------
 .../SqlCommandHelperTest.cs                   |  2 +-
 .../app.config                                | 11 ---
 .../packages.config                           | 17 -----
 11 files changed, 38 insertions(+), 79 deletions(-)
 delete mode 100644 test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/app.config
 delete mode 100644 test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/packages.config

diff --git a/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj b/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
index dd92915..aaffb00 100644
--- a/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
+++ b/src/SqlSessionStateProviderAsync/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.csproj
@@ -92,6 +92,11 @@
       <Name>Microsoft.AspNet.SessionState.SessionStateModule</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Data.SqlClient">
+      <Version>5.1.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
diff --git a/src/SqlSessionStateProviderAsync/SqlCommandExtension.cs b/src/SqlSessionStateProviderAsync/SqlCommandExtension.cs
index a7ab19b..c8ea32e 100644
--- a/src/SqlSessionStateProviderAsync/SqlCommandExtension.cs
+++ b/src/SqlSessionStateProviderAsync/SqlCommandExtension.cs
@@ -3,8 +3,8 @@
 
 namespace Microsoft.AspNet.SessionState
 {
-    using System.Data.SqlClient;
     using System.Diagnostics;
+    using Microsoft.Data.SqlClient;
 
     static class SqlCommandExtension
     {
diff --git a/src/SqlSessionStateProviderAsync/SqlCommandHelper.cs b/src/SqlSessionStateProviderAsync/SqlCommandHelper.cs
index 88fc605..4db83a3 100644
--- a/src/SqlSessionStateProviderAsync/SqlCommandHelper.cs
+++ b/src/SqlSessionStateProviderAsync/SqlCommandHelper.cs
@@ -3,8 +3,8 @@
 
 namespace Microsoft.AspNet.SessionState
 {
+    using Microsoft.Data.SqlClient;
     using System.Data;
-    using System.Data.SqlClient;
 
     class SqlCommandHelper
     {
diff --git a/src/SqlSessionStateProviderAsync/SqlInMemoryTableSessionStateRepository.cs b/src/SqlSessionStateProviderAsync/SqlInMemoryTableSessionStateRepository.cs
index ec655f3..b3ac296 100644
--- a/src/SqlSessionStateProviderAsync/SqlInMemoryTableSessionStateRepository.cs
+++ b/src/SqlSessionStateProviderAsync/SqlInMemoryTableSessionStateRepository.cs
@@ -4,8 +4,8 @@
 namespace Microsoft.AspNet.SessionState
 {
     using Resources;
+    using Microsoft.Data.SqlClient;
     using System;
-    using System.Data.SqlClient;
     using System.Diagnostics;
     using System.Runtime.CompilerServices;
     using System.Threading;
diff --git a/src/SqlSessionStateProviderAsync/SqlParameterCollectionExtension.cs b/src/SqlSessionStateProviderAsync/SqlParameterCollectionExtension.cs
index 47ee355..73ad96d 100644
--- a/src/SqlSessionStateProviderAsync/SqlParameterCollectionExtension.cs
+++ b/src/SqlSessionStateProviderAsync/SqlParameterCollectionExtension.cs
@@ -3,9 +3,9 @@
 
 namespace Microsoft.AspNet.SessionState
 {
+    using Microsoft.Data.SqlClient;
     using System;
     using System.Data;
-    using System.Data.SqlClient;
 
     static class SqlParameterCollectionExtension
     {
diff --git a/src/SqlSessionStateProviderAsync/SqlSessionStateRepository.cs b/src/SqlSessionStateProviderAsync/SqlSessionStateRepository.cs
index 2cd6a2e..950d65a 100644
--- a/src/SqlSessionStateProviderAsync/SqlSessionStateRepository.cs
+++ b/src/SqlSessionStateProviderAsync/SqlSessionStateRepository.cs
@@ -4,8 +4,8 @@
 namespace Microsoft.AspNet.SessionState
 {
     using Resources;
+    using Microsoft.Data.SqlClient;
     using System;
-    using System.Data.SqlClient;
     using System.Runtime.CompilerServices;
     using System.Threading.Tasks;
     using System.Web;
diff --git a/src/SqlSessionStateProviderAsync/SqlSessionStateRepositoryUtil.cs b/src/SqlSessionStateProviderAsync/SqlSessionStateRepositoryUtil.cs
index 0c456ed..52473ab 100644
--- a/src/SqlSessionStateProviderAsync/SqlSessionStateRepositoryUtil.cs
+++ b/src/SqlSessionStateProviderAsync/SqlSessionStateRepositoryUtil.cs
@@ -4,10 +4,10 @@
 namespace Microsoft.AspNet.SessionState
 {
     using Resources;
+    using Microsoft.Data.SqlClient;
     using System;
     using System.Data;
-    using System.Data.SqlClient;
-using System.Runtime.CompilerServices;
+    using System.Runtime.CompilerServices;
     using System.Security.Principal;
     using System.Threading.Tasks;
     using System.Web;
diff --git a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj
index f1a6647..ee9cc39 100644
--- a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj
+++ b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test.csproj
@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
-  <Import Project="..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props" Condition="Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" />
-  <Import Project="..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props')" />
-  <Import Project="..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props" Condition="Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory),Microsoft.Aspnet.SessionState.sln))\tools\SqlSessionStateProviderAsync.settings.targets" />
   <PropertyGroup>
@@ -48,21 +44,9 @@
     <DelaySign>true</DelaySign>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>
-    </Reference>
-    <Reference Include="Moq, Version=4.7.137.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Moq.4.7.137\lib\net45\Moq.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.1.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.Threading.Tasks.Extensions.4.4.0\lib\netstandard2.0\System.Threading.Tasks.Extensions.dll</HintPath>
-    </Reference>
-    <Reference Include="System.ValueTuple, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\System.ValueTuple.4.4.0\lib\net461\System.ValueTuple.dll</HintPath>
-    </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -70,29 +54,12 @@
     <Reference Include="System.Data" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml" />
-    <Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="xunit.assert, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.assert.2.3.1\lib\netstandard1.1\xunit.assert.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\xunit.extensibility.execution.2.3.1\lib\net452\xunit.execution.desktop.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="SqlCommandHelperTest.cs" />
     <Compile Include="SqlSessionStateAsyncProviderTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="app.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\SessionStateModule\Microsoft.AspNet.SessionState.SessionStateModule.csproj">
       <Project>{7238f90d-3bce-4f40-a5ba-ea36ad484bd6}</Project>
@@ -104,10 +71,33 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Analyzer Include="..\..\packages\xunit.analyzers.0.7.0\analyzers\dotnet\cs\xunit.analyzers.dll" />
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
   <ItemGroup>
-    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+    <PackageReference Include="Castle.Core">
+      <Version>4.2.1</Version>
+    </PackageReference>
+    <PackageReference Include="Moq">
+      <Version>4.7.137</Version>
+    </PackageReference>
+    <PackageReference Include="xunit">
+      <Version>2.3.1</Version>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.console">
+      <Version>2.3.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.msbuild">
+      <Version>2.3.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="xunit.runner.visualstudio">
+      <Version>2.3.1</Version>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
@@ -115,15 +105,7 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('$(SolutionDir)\.nuget\NuGet.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)\.nuget\NuGet.targets'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.visualstudio.2.3.1\build\net20\xunit.runner.visualstudio.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.runner.console.2.3.1\build\xunit.runner.console.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
-    <Error Condition="!Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
   </Target>
-  <Import Project="..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets" Condition="Exists('..\..\packages\xunit.runner.msbuild.2.3.1\build\net452\xunit.runner.msbuild.targets')" />
-  <Import Project="..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/SqlCommandHelperTest.cs b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/SqlCommandHelperTest.cs
index d835d4a..a82c01e 100644
--- a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/SqlCommandHelperTest.cs
+++ b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/SqlCommandHelperTest.cs
@@ -3,9 +3,9 @@
 
 namespace Microsoft.AspNet.SessionState.SqlSessionStateAsyncProvider.Test
 {
+    using Microsoft.Data.SqlClient;
     using System;
     using System.Data;
-    using System.Data.SqlClient;
     using Xunit;
 
     public class SqlCommandHelperTest
diff --git a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/app.config b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/app.config
deleted file mode 100644
index 7d8c922..0000000
--- a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/app.config
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<configuration>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.1.0" newVersion="4.1.1.0" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
-</configuration>
\ No newline at end of file
diff --git a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/packages.config b/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/packages.config
deleted file mode 100644
index 4950f48..0000000
--- a/test/Microsoft.AspNet.SessionState.SqlSessionStateProviderAsync.Test/packages.config
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="Castle.Core" version="4.2.1" targetFramework="net462" />
-  <package id="Moq" version="4.7.137" targetFramework="net462" />
-  <package id="System.Threading.Tasks.Extensions" version="4.4.0" targetFramework="net462" />
-  <package id="System.ValueTuple" version="4.4.0" targetFramework="net462" />
-  <package id="xunit" version="2.3.1" targetFramework="net462" />
-  <package id="xunit.abstractions" version="2.0.1" targetFramework="net462" />
-  <package id="xunit.analyzers" version="0.7.0" targetFramework="net462" />
-  <package id="xunit.assert" version="2.3.1" targetFramework="net462" />
-  <package id="xunit.core" version="2.3.1" targetFramework="net462" />
-  <package id="xunit.extensibility.core" version="2.3.1" targetFramework="net462" />
-  <package id="xunit.extensibility.execution" version="2.3.1" targetFramework="net462" />
-  <package id="xunit.runner.console" version="2.3.1" targetFramework="net462" developmentDependency="true" />
-  <package id="xunit.runner.msbuild" version="2.3.1" targetFramework="net462" developmentDependency="true" />
-  <package id="xunit.runner.visualstudio" version="2.3.1" targetFramework="net462" developmentDependency="true" />
-</packages>
\ No newline at end of file