Merge pull request #216 from bd-andrew-young/upgrade-sqlclient-driver-to-Microsoft.Data.SqlClient

Upgrade sqlclient driver to 2.1.2

Author: stuartpa

Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj

@@ -19,7 +19,7 @@
     <RuntimeIdentifiers>win;unix</RuntimeIdentifiers>
     <RootNamespace>Microsoft.Azure.SqlDatabase.ElasticScale</RootNamespace>
   </PropertyGroup>
-  
+
   <Import Project="$([MSBuild]::GetPathOfFileAbove('build.props'))" />
   <Import Project="$([MSBuild]::GetPathOfFileAbove('strongname.props'))" />
 
@@ -50,7 +50,7 @@
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Data.SqlClient">
-      <Version>1.1.1</Version>
+      <Version>2.1.2</Version>
     </PackageReference>
   </ItemGroup>
 

Src/ElasticScale.Client/ShardManagement/ShardMap/ShardMapUtils.cs

@@ -43,6 +43,10 @@ internal static class ShardMapUtils
         /// because it may not be available in the .NET framework version that we are running in
         /// </summary>
         internal static readonly string ActiveDirectoryInteractiveStr = "ActiveDirectoryInteractive";
+        internal static readonly string ActiveDirectoryServicePrincipal = "ActiveDirectoryServicePrincipal";
+        internal static readonly string ActiveDirectoryDeviceCodeFlow = "ActiveDirectoryDeviceCodeFlow";
+        internal static readonly string ActiveDirectoryManagedIdentity = "ActiveDirectoryManagedIdentity";
+        internal static readonly string ActiveDirectoryMSI = "ActiveDirectoryMSI";
 
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1810:InitializeReferenceTypeStaticFieldsInline")]
         static ShardMapUtils()

Src/ElasticScale.Client/ShardManagement/SqlStore/SqlShardMapManagerCredentials.cs

@@ -166,7 +166,12 @@ internal static void EnsureCredentials(
             {
                 string authentication = connectionString[ShardMapUtils.Authentication].ToString();
                 if (authentication.Equals(ShardMapUtils.ActiveDirectoryIntegratedStr, StringComparison.OrdinalIgnoreCase)
-                    || authentication.Equals(ShardMapUtils.ActiveDirectoryInteractiveStr, StringComparison.OrdinalIgnoreCase))
+                    || authentication.Equals(ShardMapUtils.ActiveDirectoryInteractiveStr, StringComparison.OrdinalIgnoreCase)
+                    || authentication.Equals(ShardMapUtils.ActiveDirectoryManagedIdentity, StringComparison.OrdinalIgnoreCase)
+                    || authentication.Equals(ShardMapUtils.ActiveDirectoryServicePrincipal, StringComparison.OrdinalIgnoreCase)
+                    || authentication.Equals(ShardMapUtils.ActiveDirectoryDeviceCodeFlow, StringComparison.OrdinalIgnoreCase)
+                    || authentication.Equals(ShardMapUtils.ActiveDirectoryMSI, StringComparison.OrdinalIgnoreCase)
+                    )
                 {
                     return;
                 }

Test/ElasticScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj

@@ -8,6 +8,6 @@
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
   </ItemGroup>
 </Project>

Test/ElasticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj

@@ -9,7 +9,7 @@
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.1.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="1.1.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\Src\ElasticScale.Client\Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj" />