Update to use BearerTokenPolicy

Author: stephentoub

eng/packages/General.props

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <PackageVersion Include="Azure.Core" Version="1.45.0" />
-    <PackageVersion Include="Azure.Identity" Version="1.13.2" />
+    <PackageVersion Include="Azure.Core" Version="1.49.0" />
+    <PackageVersion Include="Azure.Identity" Version="1.16.0" />
     <PackageVersion Include="Azure.Storage.Files.DataLake" Version="12.21.0" />
     <PackageVersion Include="Azure.AI.Inference" Version="1.0.0-beta.5" />
     <PackageVersion Include="DnsClient" Version="1.8.0" />

src/ProjectTemplates/Microsoft.Extensions.AI.Templates/src/ChatWithCustomData/ChatWithCustomData-CSharp.Web/Program.cs

@@ -62,10 +62,9 @@
 #endif
 var azureOpenAIEndpoint = new Uri(new Uri(builder.Configuration["AzureOpenAI:Endpoint"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Endpoint. See the README for details.")), "/openai/v1");
 #if (IsManagedIdentity)
-var tokenCredential = new DefaultAzureCredential();
-var token = tokenCredential.GetToken(new TokenRequestContext(["https://cognitiveservices.azure.com/.default"]), default);
-var openAIOptions = new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint };
-var azureOpenAi = new OpenAIClient(new ApiKeyCredential(token.Token), openAIOptions);
+var azureOpenAi = new OpenAIClient(
+    new BearerTokenPolicy(new DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"),
+    new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint });
 #else
 var openAIOptions = new OpenAIClientOptions { Endpoint = azureOpenAIEndpoint };
 var azureOpenAi = new OpenAIClient(new ApiKeyCredential(builder.Configuration["AzureOpenAI:Key"] ?? throw new InvalidOperationException("Missing configuration: AzureOpenAi:Key. See the README for details.")), openAIOptions);

test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/Microsoft.Extensions.AI.Evaluation.Integration.Tests.csproj

@@ -4,6 +4,7 @@
     <TargetFrameworks>$(LatestTargetFramework)</TargetFrameworks>
     <RootNamespace>Microsoft.Extensions.AI</RootNamespace>
     <Description>Integration tests for Microsoft.Extensions.AI.Evaluation.</Description>
+    <NoWarn>$(NoWarn);OPENAI001</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

test/Libraries/Microsoft.Extensions.AI.Evaluation.Integration.Tests/Setup.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.ClientModel;
+using System.ClientModel.Primitives;
 using Azure.Core;
 using Azure.Identity;
 using OpenAI;
@@ -24,24 +25,18 @@ internal static ChatConfiguration CreateChatConfiguration()
     private static OpenAI.Chat.ChatClient GetOpenAIClient()
     {
         // Use Azure endpoint with /openai/v1 suffix
-        var endpoint = new Uri(new Uri(Settings.Current.Endpoint), "/openai/v1");
-        var credential = new ChainedTokenCredential(new AzureCliCredential(), new DefaultAzureCredential());
-
-        OpenAIClient client;
-        if (OfflineOnly)
-        {
-            var options = new OpenAIClientOptions { Endpoint = endpoint };
-            client = new OpenAIClient(new ApiKeyCredential("Bogus"), options);
-        }
-        else
+        var options = new OpenAIClientOptions
         {
-            // Get Azure token and use as API key
-            var token = credential.GetToken(
-                new TokenRequestContext(["https://cognitiveservices.azure.com/.default"]),
-                default);
-            var options = new OpenAIClientOptions { Endpoint = endpoint };
-            client = new OpenAIClient(new ApiKeyCredential(token.Token), options);
-        }
+            Endpoint = new Uri(new Uri(Settings.Current.Endpoint), "/openai/v1")
+        };
+
+        OpenAIClient client = OfflineOnly ?
+            new OpenAIClient(new ApiKeyCredential("Bogus"), options) :
+            new OpenAIClient(
+                new BearerTokenPolicy(
+                    new ChainedTokenCredential(new AzureCliCredential(), new DefaultAzureCredential()),
+                    "https://cognitiveservices.azure.com/.default"),
+                options);
 
         return client.GetChatClient(Settings.Current.DeploymentName);
     }

test/Libraries/Microsoft.Extensions.AI.OpenAI.Tests/IntegrationTestHelpers.cs

@@ -3,7 +3,7 @@
 
 using System;
 using System.ClientModel;
-using Azure.Core;
+using System.ClientModel.Primitives;
 using Azure.Identity;
 using OpenAI;
 
@@ -26,23 +26,12 @@ internal static class IntegrationTestHelpers
                 ?? throw new InvalidOperationException("To use AzureOpenAI, set a value for OpenAI:Endpoint");
 
             // Use Azure endpoint with /openai/v1 suffix
-            var azureEndpointUri = new Uri(new Uri(endpoint), "/openai/v1");
-
-            if (apiKey is not null)
-            {
-                var options = new OpenAIClientOptions { Endpoint = azureEndpointUri };
-                return new OpenAIClient(new ApiKeyCredential(apiKey), options);
-            }
-            else
-            {
-                // Use Azure Identity authentication - get token and use as API key
-                var tokenCredential = new DefaultAzureCredential();
-                var token = tokenCredential.GetToken(
-                    new TokenRequestContext(["https://cognitiveservices.azure.com/.default"]),
-                    default);
-                var options = new OpenAIClientOptions { Endpoint = azureEndpointUri };
-                return new OpenAIClient(new ApiKeyCredential(token.Token), options);
-            }
+            var options = new OpenAIClientOptions { Endpoint = new Uri(new Uri(endpoint), "/openai/v1") };
+            return apiKey is not null ?
+                new OpenAIClient(new ApiKeyCredential(apiKey), options) :
+                new OpenAIClient(
+                    new BearerTokenPolicy(new DefaultAzureCredential(), "https://cognitiveservices.azure.com/.default"),
+                    options);
         }
         else if (apiKey is not null)
         {