Fix unittests and the AOT compatibility.

Author: nick863

eng/Packages.Data.props

@@ -204,15 +204,15 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.Agents'))">
-    <PackageReference Update="OpenAI" Version="[2.5.0,3.0)" />
+    <PackageReference Update="OpenAI" Version="[2.6.0,3.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.Projects'))">
-    <PackageReference Update="OpenAI" Version="[2.5.0,3.0)" />
+    <PackageReference Update="OpenAI" Version="[2.6.0,3.0)" />
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.AI.OpenAI'))">
-    <PackageReference Update="OpenAI" Version="2.5.0" />
+    <PackageReference Update="OpenAI" Version="2.6.0" />
   </ItemGroup>
 
   <ItemGroup Condition="$(MSBuildProjectName.StartsWith('Azure.Developer.Playwright'))">

sdk/ai/Azure.AI.Agents/src/Custom/Internal/AdditionalPropertyHelpers.cs

@@ -199,9 +199,12 @@ public static void AddAzureFinetuningParityPolicy(OpenAIClientOptions options)
                                         "Content-Disposition: form-data; name=file; filename=([^;]*);.*") is Match fileContentDispositionMatch
                                     && fileContentDispositionMatch.Success)
                                 {
-                                    newRequestWriter.WriteLine("Content-Type: application/octet-stream");
+                                    // We are explicitly set the line ending as
+                                    // WriteLine will add only \n symbol on Unix systems,
+                                    // Which will result in error 400 on te service side.
+                                    newRequestWriter.Write("Content-Type: application/octet-stream\r\n");
                                 }
-                                newRequestWriter.WriteLine(line);
+                                newRequestWriter.Write($"{line}\r\n");
                                 previousLine = line;
                             }
 

sdk/ai/Azure.AI.Agents/src/Custom/Internal/PipelinePolicyHelpers.cs

@@ -2,7 +2,11 @@
 // Licensed under the MIT License.
 
 using System;
+using System.ClientModel;
 using System.Collections.Generic;
+using System.IO;
+using System.Text;
+using System.Text.Json;
 using OpenAI.Files;
 
 #pragma warning disable CS0618
@@ -13,10 +17,18 @@ public static partial class OpenAIFileExtensions
 {
     public static string GetAzureFileStatus(this OpenAIFile file)
     {
-        if (AdditionalPropertyHelpers.GetAdditionalProperty<OpenAIFile, string>(file, "_sdk_status") is string extraStatusValue
-            && extraStatusValue.Length > 2)
+        using BinaryContent contentBytes = BinaryContent.Create(file, ModelSerializationExtensions.WireOptions);
+        using var stream = new MemoryStream();
+        contentBytes.WriteTo(stream);
+        string json = Encoding.UTF8.GetString(stream.ToArray());
+        JsonDocument doc = JsonDocument.Parse(json);
+        if (doc.RootElement.TryGetProperty("_sdk_status", out JsonElement extraStatusElement))
         {
-            return extraStatusValue.Substring(1, extraStatusValue.Length - 2);
+            string extraStatusValue = extraStatusElement.GetString();
+            if (!string.IsNullOrEmpty(extraStatusValue))
+            {
+                return extraStatusValue;
+            }
         }
         return null;
     }

sdk/ai/Azure.AI.Agents/src/Custom/OpenAIFileExtensions.cs

@@ -5,11 +5,10 @@
 
 using System;
 using System.ClientModel.Primitives;
-using System.Collections.Generic;
-using System.Reflection;
 using OpenAI.Responses;
 
 #pragma warning disable OPENAI001
+#pragma warning disable SCME0001
 
 namespace Azure.AI.Agents;
 
@@ -22,9 +21,9 @@ public static partial class ResponseCreationOptionsExtensions
     /// <param name="agentReference"></param>
     public static void SetAgentReference(this ResponseCreationOptions responseCreationOptions, AgentReference agentReference)
     {
-        AdditionalPropertyHelpers.SetAdditionalProperty(responseCreationOptions, "agent", agentReference);
-        // Agent specification is mutually exclusive with model specification; see internal issue 4770700
-        AdditionalPropertyHelpers.SetAdditionalProperty(responseCreationOptions, "model", BinaryData.FromBytes("\"__EMPTY__\""u8.ToArray()));
+        BinaryData agentReferenceBin = ModelReaderWriter.Write(agentReference, ModelSerializationExtensions.WireOptions, AzureAIAgentsContext.Default);
+        responseCreationOptions.Patch.Set("$.agent"u8, agentReferenceBin);
+        responseCreationOptions.Patch.Remove("$.model"u8);
     }
 
     /// <summary>
@@ -60,9 +59,7 @@ public static void SetAgentReference(this ResponseCreationOptions responseCreati
     /// <param name="conversationId"></param>
     public static void SetConversationReference(this ResponseCreationOptions responseCreationOptions, string conversationId)
     {
-        responseCreationOptions.SetAdditionalProperty(
-            "conversation",
-            BinaryData.FromString($"\"{conversationId}\""));
+        responseCreationOptions.Patch.Set("$.conversation"u8, $"{conversationId}");
     }
 
     /// <summary>

sdk/ai/Azure.AI.Agents/src/Custom/ResponseCreationOptionsExtensions.cs

@@ -22,7 +22,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Azure.Identity" />
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="9.0.0" />
+    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" VersionOverride="9.0.9" />
     <PackageReference Include="NUnit" VersionOverride="4.4.0" />
     <PackageReference Include="NUnit3TestAdapter" VersionOverride="5.1.0"/>
     <PackageReference Include="Microsoft.NET.Test.Sdk" />