Task 41895: Complete Step 4 PR

- Addressed comments from Step 3 PR.

Author: paulmedynski

Directory.Packages.props

@@ -33,13 +33,13 @@
       Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
       Version="$(AkvPackageVersion)" />
   </ItemGroup>
-  
+
   <!-- ===================================================================== -->
   <!-- Shared Dependencies -->
 
   <!-- Public -->
   <ItemGroup>
-    <!-- MDS and AKV -->
+    <!-- MDS, Azure, and AKV -->
     <PackageVersion Include="Azure.Core" Version="1.49.0" />
     <PackageVersion Include="Microsoft.Identity.Client" Version="4.78.0" />
   </ItemGroup>
@@ -49,7 +49,7 @@
     <!-- MDS and AKV -->
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.9" />
   </ItemGroup>
-  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">   
+  <ItemGroup Condition="!$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <!-- MDS and AKV -->
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
   </ItemGroup>
@@ -105,13 +105,12 @@
 
   <!-- Common Dependencies (.NET and .NET Framework) -->
   <ItemGroup>
-    <PackageVersion Include="Azure.Identity" Version="1.17.0" />
     <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.14.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.14.0" />
   </ItemGroup>
 
   <!-- Common Target Framework Specific Dependencies -->
-  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">    
+  <ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net9.0'))">
     <PackageVersion Include="Microsoft.Bcl.Cryptography" Version="9.0.9" />
     <PackageVersion Include="System.Configuration.ConfigurationManager" Version="9.0.9" />
     <PackageVersion Include="System.Security.Cryptography.Pkcs" Version="9.0.9" />
@@ -143,6 +142,9 @@
   <!-- Azure Dependencies -->
 
   <!-- None -->
+  <ItemGroup>
+    <PackageVersion Include="Azure.Identity" Version="1.17.0" />
+  </ItemGroup>
 
   <!-- ===================================================================== -->
   <!-- AKV Dependencies -->

src/Microsoft.Data.SqlClient.Extensions/Azure/src/Azure.csproj

@@ -95,6 +95,7 @@
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
   </ItemGroup>

src/Microsoft.Data.SqlClient/src/Microsoft/Data/SqlClient/Connection/SqlConnectionInternal.cs

@@ -2860,6 +2860,20 @@ private SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
 
                     // Fall through to retry...
                 }
+                // If the provider throws anything else, it's an API violation, which we must
+                // consume to avoid breaking our API promise.
+                catch (Exception ex)
+                {
+                    throw ADP.CreateSqlException(
+                        new ProviderApiViolationException(
+                            message:
+                                "API violation; provider threw unexpected exception " +
+                                ex.GetType().FullName + ": " + ex.Message,
+                            causedBy: ex),
+                        ConnectionOptions,
+                        this,
+                        username);
+                }
             }
 
             // Nullable context has exposed that _fedAuthToken may be null here,
@@ -2887,6 +2901,15 @@ private SqlFedAuthToken GetFedAuthToken(SqlFedAuthInfo fedAuthInfo)
             return _fedAuthToken;
         }
 
+        // Thrown when an authentication provider violates the expected API contract.
+        private class ProviderApiViolationException : SqlAuthenticationProviderException
+        {
+            public ProviderApiViolationException(string message, Exception causedBy)
+                : base(message, causedBy)
+            {
+            }
+        }
+
         #nullable disable
 
         private void Login(

tools/specs/Microsoft.Data.SqlClient.nuspec

@@ -36,8 +36,6 @@
 
     <dependencies>
       <group targetFramework="net462">
-        <dependency id="Azure.Core" version="1.49.0" />
-        <dependency id="Azure.Identity" version="1.16.0" />
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.SNI" version="6.0.2" />
@@ -54,8 +52,6 @@
         <dependency id="System.ValueTuple" version="4.6.1" />
       </group>
       <group targetFramework="net8.0">
-        <dependency id="Azure.Core" version="1.49.0" />
-        <dependency id="Azure.Identity" version="1.16.0" />
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
@@ -67,8 +63,6 @@
         <dependency id="System.Security.Cryptography.Pkcs" version="8.0.1" />
       </group>
       <group targetFramework="net9.0">
-        <dependency id="Azure.Core" version="1.49.0" />
-        <dependency id="Azure.Identity" version="1.16.0" />
         <dependency id="Microsoft.Bcl.Cryptography" version="9.0.9" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />
@@ -80,8 +74,6 @@
         <dependency id="System.Security.Cryptography.Pkcs" version="9.0.9" />
       </group>
       <group targetFramework="netstandard2.0">
-        <dependency id="Azure.Core" version="1.49.0" />
-        <dependency id="Azure.Identity" version="1.16.0" />
         <dependency id="Microsoft.Bcl.Cryptography" version="8.0.0" />
         <dependency id="Microsoft.Data.SqlClient.Extensions.Abstractions" version="$AbstractionsPackageVersion$" />
         <dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="6.0.2" exclude="Compile" />