Update System.Memory.Data (#46134)

m-redding · web-flow · commit 448d80d80ad0 · 2024-09-30T16:57:44.000-04:00
* link fixes * Revert "link fixes" This reverts commit 61d9eaa. * update * AOT updates * SCM test fix * update API * Another storage fix * fixes for communication / openai * update snippets * fix * fixes
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
@@ -89,7 +89,7 @@
     <PackageReference Update="System.ClientModel" Version="1.1.0" />
     <PackageReference Update="System.IO.Hashing" Version="6.0.0" />
     <PackageReference Update="System.Memory" Version="4.5.5" />
-    <PackageReference Update="System.Memory.Data" Version="1.0.2" />
+    <PackageReference Update="System.Memory.Data" Version="6.0.0" />
     <PackageReference Update="System.Numerics.Vectors" Version="4.5.0" />
     <PackageReference Update="System.Net.Http" Version="4.3.4" />
     <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
diff --git a/sdk/communication/Azure.Communication.JobRouter/README.md b/sdk/communication/Azure.Communication.JobRouter/README.md
@@ -157,10 +157,10 @@ foreach (EventGridEvent egEvent in egEvents)
     switch (egEvent.EventType)
     {
         case "Microsoft.Communication.WorkerOfferIssued":
-            AcsRouterWorkerOfferIssuedEventData deserializedEventData =
+            AcsRouterWorkerOfferIssuedEventData? deserializedEventData =
                 egEvent.Data.ToObjectFromJson<AcsRouterWorkerOfferIssuedEventData>();
-            Console.Write(deserializedEventData.OfferId); // Offer Id
-            offerId = deserializedEventData.OfferId;
+            Console.Write(deserializedEventData?.OfferId); // Offer Id
+            offerId = deserializedEventData?.OfferId ?? string.Empty;
             break;
         // Handle any other custom event type
         default:
diff --git a/sdk/communication/Azure.Communication.JobRouter/samples/Sample1_HelloWorld.md b/sdk/communication/Azure.Communication.JobRouter/samples/Sample1_HelloWorld.md
@@ -102,10 +102,10 @@ foreach (EventGridEvent egEvent in egEvents)
     switch (egEvent.EventType)
     {
         case "Microsoft.Communication.WorkerOfferIssued":
-            AcsRouterWorkerOfferIssuedEventData deserializedEventData =
+            AcsRouterWorkerOfferIssuedEventData? deserializedEventData =
                 egEvent.Data.ToObjectFromJson<AcsRouterWorkerOfferIssuedEventData>();
-            Console.Write(deserializedEventData.OfferId); // Offer Id
-            offerId = deserializedEventData.OfferId;
+            Console.Write(deserializedEventData?.OfferId); // Offer Id
+            offerId = deserializedEventData?.OfferId ?? string.Empty;
             break;
         // Handle any other custom event type
         default:
diff --git a/sdk/communication/Azure.Communication.JobRouter/samples/Sample1_HelloWorldAsync.md b/sdk/communication/Azure.Communication.JobRouter/samples/Sample1_HelloWorldAsync.md
@@ -102,10 +102,10 @@ foreach (EventGridEvent egEvent in egEvents)
     switch (egEvent.EventType)
     {
         case "Microsoft.Communication.WorkerOfferIssued":
-            AcsRouterWorkerOfferIssuedEventData deserializedEventData =
+            AcsRouterWorkerOfferIssuedEventData? deserializedEventData =
                 egEvent.Data.ToObjectFromJson<AcsRouterWorkerOfferIssuedEventData>();
-            Console.Write(deserializedEventData.OfferId); // Offer Id
-            offerId = deserializedEventData.OfferId;
+            Console.Write(deserializedEventData?.OfferId); // Offer Id
+            offerId = deserializedEventData?.OfferId ?? string.Empty;
             break;
         // Handle any other custom event type
         default:
diff --git a/sdk/communication/Azure.Communication.JobRouter/tests/Samples/JobRouterChangeNotification.cs b/sdk/communication/Azure.Communication.JobRouter/tests/Samples/JobRouterChangeNotification.cs
@@ -62,10 +62,10 @@ public void ReceivedChangeNotification()
                 switch (egEvent.EventType)
                 {
                     case "Microsoft.Communication.WorkerOfferIssued":
-                        AcsRouterWorkerOfferIssuedEventData deserializedEventData =
+                        AcsRouterWorkerOfferIssuedEventData? deserializedEventData =
                             egEvent.Data.ToObjectFromJson<AcsRouterWorkerOfferIssuedEventData>();
-                        Console.Write(deserializedEventData.OfferId); // Offer Id
-                        offerId = deserializedEventData.OfferId;
+                        Console.Write(deserializedEventData?.OfferId); // Offer Id
+                        offerId = deserializedEventData?.OfferId ?? string.Empty;
                         break;
                     // Handle any other custom event type
                     default:
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net6.0.cs b/sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
@@ -22,6 +22,7 @@ public static partial class AzureCoreExtensions
         [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming.")]
         public static dynamic ToDynamicFromJson(this System.BinaryData utf8Json, Azure.Core.Serialization.JsonPropertyNames propertyNameFormat, string dateTimeFormat = "o") { throw null; }
         public static System.Threading.Tasks.ValueTask<T?> ToObjectAsync<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
+        [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming.")]
         public static object? ToObjectFromJson(this System.BinaryData data) { throw null; }
         public static T? ToObject<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }
     }
@@ -1189,6 +1190,7 @@ protected ObjectSerializer() { }
 }
 namespace Azure.Messaging
 {
+    [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming.")]
     public partial class CloudEvent
     {
         public CloudEvent(string source, string type, System.BinaryData? data, string? dataContentType, Azure.Messaging.CloudEventDataFormat dataFormat = Azure.Messaging.CloudEventDataFormat.Binary) { }
diff --git a/sdk/core/Azure.Core/src/Messaging/CloudEvent.cs b/sdk/core/Azure.Core/src/Messaging/CloudEvent.cs
@@ -3,14 +3,18 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Azure.Core;
+using Azure.Core.Serialization;
 
 namespace Azure.Messaging
 {
     /// <summary> Represents a CloudEvent conforming to the 1.0 schema. This type has built-in serialization using System.Text.Json.</summary>
     [JsonConverter(typeof(CloudEventConverter))]
+    [RequiresUnreferencedCode(DynamicData.SerializationRequiresUnreferencedCode)]
+    [RequiresDynamicCode(DynamicData.SerializationRequiresUnreferencedCode)]
     public class CloudEvent
     {
         /// <summary> Initializes a new instance of the <see cref="CloudEvent"/> class. </summary>
diff --git a/sdk/core/Azure.Core/src/Messaging/CloudEventConverter.cs b/sdk/core/Azure.Core/src/Messaging/CloudEventConverter.cs
@@ -3,16 +3,20 @@
 
 using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 using Azure.Core;
+using Azure.Core.Serialization;
 
 namespace Azure.Messaging
 {
     /// <summary>
     /// A custom converter that attributes the <see cref="CloudEvent"/> type.
     /// This allows System.Text.Json to serialize and deserialize CloudEvents by default.
     /// </summary>
+    [RequiresUnreferencedCode(DynamicData.SerializationRequiresUnreferencedCode)]
+    [RequiresDynamicCode(DynamicData.SerializationRequiresUnreferencedCode)]
     internal class CloudEventConverter : JsonConverter<CloudEvent>
     {
         /// <summary>
diff --git a/sdk/core/Azure.Core/src/Serialization/AzureCoreExtensions.cs b/sdk/core/Azure.Core/src/Serialization/AzureCoreExtensions.cs
@@ -54,6 +54,8 @@ public static class AzureCoreExtensions
         /// Otherwise, it returns either an object[] or Dictionary&lt;string, object&gt;.
         /// Each value in the key value pair or list will also be converted into a primitive or another complex type recursively.
         /// </returns>
+        [RequiresUnreferencedCode(DynamicData.SerializationRequiresUnreferencedCode)]
+        [RequiresDynamicCode(DynamicData.SerializationRequiresUnreferencedCode)]
         public static object? ToObjectFromJson(this BinaryData data)
         {
             JsonElement element = data.ToObjectFromJson<JsonElement>();
diff --git a/sdk/core/Azure.Core/tests/compatibility/ExpectedAotWarnings.txt b/sdk/core/Azure.Core/tests/compatibility/ExpectedAotWarnings.txt
@@ -10,7 +10,7 @@ ILC : AOT analysis warning IL3050: Azure\.Core\.Json\.MutableJsonDocument: Using
 .*Azure\.Core.src.DynamicData.DynamicData\.ObjectEnumerator\.cs\(\d*\): Trim analysis warning IL2026: Azure\.Core\.Serialization\.DynamicData\.ObjectEnumerator\.Current\.get: Using member 'Azure\.Core\.Serialization\.DynamicData\.DynamicData\(MutableJsonElement,DynamicDataOptions\)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code\. This class utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming
 .*Azure\.Core.src.DynamicData.DynamicData\.ObjectEnumerator\.cs\(\d*\): AOT analysis warning IL3050: Azure\.Core\.Serialization\.DynamicData\.ObjectEnumerator\.Current\.get: Using member 'Azure\.Core\.Serialization\.DynamicData\.DynamicData\(MutableJsonElement,DynamicDataOptions\)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling\. This class utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming
 .*Azure\.Core.src.DynamicData.DynamicDataProperty\.cs\(\d*\): Trim analysis warning IL2026: Azure\.Core\.Serialization\.DynamicDataProperty\.System\.Dynamic\.IDynamicMetaObjectProvider\.GetMetaObject\(Expression\): Using member 'Azure\.Core\.Serialization\.DynamicDataProperty\.MetaObject\.MetaObject\(Expression,IDynamicMetaObjectProvider\)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code
-ILC : Trim analysis warning IL2026: System\.BinaryData\.BinaryData\(Object,JsonSerializerOptions,Type\): Using member 'System\.Text\.Json\.JsonSerializer\.SerializeToUtf8Bytes\(Object,Type,JsonSerializerOptions\)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code\. JSON serialization and deserialization might require types that cannot be statically analyzed\. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved
+ILC : Trim analysis warning IL2026: Azure\.Messaging\.CloudEvent: Using member 'Azure\.Messaging\.CloudEventConverter\.CloudEventConverter\(\)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code\. This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming
+ILC : AOT analysis warning IL3050: Azure\.Messaging\.CloudEvent: Using member 'Azure\.Messaging\.CloudEventConverter\.CloudEventConverter\(\)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling\. This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming
 ILC : AOT analysis warning IL3050: System\.BinaryData\.BinaryData\(Object,JsonSerializerOptions,Type\): Using member 'System\.Text\.Json\.JsonSerializer\.SerializeToUtf8Bytes\(Object,Type,JsonSerializerOptions\)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling\. JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation\. Use System\.Text\.Json source generation for native AOT applications
-ILC : Trim analysis warning IL2026: System\.BinaryData\.ToObjectFromJson<T>\(JsonSerializerOptions\): Using member 'System\.Text\.Json\.JsonSerializer\.Deserialize\(ReadOnlySpan`1<Byte>,Type,JsonSerializerOptions\)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code\. JSON serialization and deserialization might require types that cannot be statically analyzed\. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved
-ILC : AOT analysis warning IL3050: System\.BinaryData\.ToObjectFromJson<T>\(JsonSerializerOptions\): Using member 'System\.Text\.Json\.JsonSerializer\.Deserialize\(ReadOnlySpan`1<Byte>,Type,JsonSerializerOptions\)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling\. JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation\. Use System\.Text\.Json source generation for native AOT applications
+ILC : AOT analysis warning IL3050: System\.BinaryData\.ToObjectFromJson<T>\(JsonSerializerOptions\): Using member 'System\.Text\.Json\.JsonSerializer\.Deserialize<T>\(ReadOnlySpan`1<Byte>,JsonSerializerOptions\)' which has 'RequiresDynamicCodeAttribute' can break functionality when AOT compiling\. JSON serialization and deserialization might require types that cannot be statically analyzed and might need runtime code generation\. Use System\.Text\.Json source generation for native AOT applications
diff --git a/sdk/core/System.ClientModel/tests/Pipeline/HttpClientPipelineTransportTests.cs b/sdk/core/System.ClientModel/tests/Pipeline/HttpClientPipelineTransportTests.cs
@@ -353,7 +353,7 @@ public async Task UnbufferedResponseContentStreamContainsResponseContent()
         Assert.AreEqual("Mock content", BinaryData.FromStream(message.Response!.ContentStream!).ToString());
 
         // The second time it's read the stream's Position is at the end
-        Assert.AreEqual(string.Empty, BinaryData.FromStream(message.Response!.ContentStream!).ToString());
+        Assert.AreEqual(0, BinaryData.FromStream(message.Response!.ContentStream!).ToArray().Length);
     }
 
     [Test]
@@ -372,7 +372,7 @@ public async Task UnbufferedResponseContentStreamEmptyIfNoResponseContent()
 
         await transport.ProcessSyncOrAsync(message, IsAsync);
 
-        Assert.AreEqual(string.Empty, BinaryData.FromStream(message.Response!.ContentStream!).ToString());
+        Assert.AreEqual(0, BinaryData.FromStream(message.Response!.ContentStream!).ToArray().Length);
     }
 
     [Test]
diff --git a/sdk/openai/tools/TestFramework/src/Mocks/MockPage.cs b/sdk/openai/tools/TestFramework/src/Mocks/MockPage.cs
@@ -31,7 +31,12 @@ public static MockPage<TValue> FromClientResult(ClientResult result)
     {
         PipelineResponse response = result.GetRawResponse();
         response.BufferContent();
-        return response.Content.ToObjectFromJson<MockPage<TValue>>();
+        MockPage<TValue> mockPage = response.Content.ToObjectFromJson<MockPage<TValue>>() ?? new MockPage<TValue>
+        {
+            Values = [],
+            Next = 0
+        };
+        return mockPage;
     }
 
     /// <summary>
diff --git a/sdk/openai/tools/TestFramework/src/Mocks/MockRestServiceClient.cs b/sdk/openai/tools/TestFramework/src/Mocks/MockRestServiceClient.cs
@@ -88,8 +88,10 @@ public virtual ClientResult Add(string id, TData data, CancellationToken token =
                 .ConfigureAwait(false);
 
             var response = result.GetRawResponse();
+            var entry = response.Content.ToObjectFromJson<MockRestService<TData>.Entry>();
+            var entryData = entry == null ? default : entry.data;
             return ClientResult.FromOptionalValue(
-                response.Content.ToObjectFromJson<MockRestService<TData>.Entry>().data,
+                entryData,
                 response);
         }
         catch (ClientResultException ex)
@@ -118,8 +120,10 @@ public virtual ClientResult Add(string id, TData data, CancellationToken token =
         {
             ClientResult result = SendSyncOrAsync(false, HttpMethod.Get, id, default, token).GetAwaiter().GetResult();
             var response = result.GetRawResponse();
+            var entry = response.Content.ToObjectFromJson<MockRestService<TData>.Entry>();
+            var entryData = entry == null ? default : entry.data;
             return ClientResult.FromOptionalValue(
-                response.Content.ToObjectFromJson<MockRestService<TData>.Entry>().data,
+                entryData,
                 response);
         }
         catch (ClientResultException ex)
@@ -263,7 +267,7 @@ protected async ValueTask<ClientResult> SendSyncOrAsync(bool isAsync, HttpMethod
             if (message.Response.Content?.ToMemory().Length > 0)
             {
                 var error = message.Response.Content.ToObjectFromJson<MockRestService<TData>.Error>();
-                throw new ClientResultException($"Error {error.error}: {error.message}", message.Response);
+                throw new ClientResultException($"Error {error?.error}: {error?.message}", message.Response);
             }
 
             throw new ClientResultException(message.Response);
diff --git a/sdk/storage/Azure.Storage.Queues/src/Models/QueueMessage.cs b/sdk/storage/Azure.Storage.Queues/src/Models/QueueMessage.cs
@@ -35,7 +35,17 @@ internal QueueMessage(string messageText)
         [EditorBrowsable(EditorBrowsableState.Never)]
         public string MessageText
         {
-            get => Body?.ToString();
+            get
+            {
+                try
+                {
+                    return Body?.ToString();
+                }
+                catch (ArgumentNullException) // workaround for: https://github.com/dotnet/runtime/issues/68262 which was fixed in 8.0.0, can remove this after upgrade
+                {
+                    return string.Empty;
+                }
+            }
             internal set => Body = value == null ? null : new BinaryData(value);
         }
 
diff --git a/sdk/storage/Azure.Storage.Queues/src/QueueMessageCodec.cs b/sdk/storage/Azure.Storage.Queues/src/QueueMessageCodec.cs
@@ -17,7 +17,14 @@ public static string EncodeMessageBody(BinaryData binaryData, QueueMessageEncodi
             switch (messageEncoding)
             {
                 case QueueMessageEncoding.None:
-                    return binaryData.ToString();
+                    try
+                    {
+                        return binaryData.ToString();
+                    }
+                    catch (ArgumentNullException) // workaround for: https://github.com/dotnet/runtime/issues/68262 which was fixed in 8.0.0, can remove this after upgrade
+                    {
+                        return string.Empty;
+                    }
                 case QueueMessageEncoding.Base64:
                     if (MemoryMarshal.TryGetArray(binaryData.ToMemory(), out var segment))
                     {

Original file line number	Diff line number	Diff line change
`@@ -22,6 +22,7 @@ public static partial class AzureCoreExtensions`
`22`	`22`	`[System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming.")]`
`23`	`23`	`public static dynamic ToDynamicFromJson(this System.BinaryData utf8Json, Azure.Core.Serialization.JsonPropertyNames propertyNameFormat, string dateTimeFormat = "o") { throw null; }`
`24`	`24`	`public static System.Threading.Tasks.ValueTask<T?> ToObjectAsync<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }`
	`25`	`+ [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming.")]`
`25`	`26`	`public static object? ToObjectFromJson(this System.BinaryData data) { throw null; }`
`26`	`27`	`public static T? ToObject<T>(this System.BinaryData data, Azure.Core.Serialization.ObjectSerializer serializer, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) { throw null; }`
`27`	`28`	`}`
`@@ -1189,6 +1190,7 @@ protected ObjectSerializer() { }`
`1189`	`1190`	`}`
`1190`	`1191`	`namespace Azure.Messaging`
`1191`	`1192`	`{`
	`1193`	`+ [System.Diagnostics.CodeAnalysis.RequiresUnreferencedCodeAttribute("This utilizes reflection-based JSON serialization and deserialization which is not compatible with trimming.")]`
`1192`	`1194`	`public partial class CloudEvent`
`1193`	`1195`	`{`
`1194`	`1196`	`public CloudEvent(string source, string type, System.BinaryData? data, string? dataContentType, Azure.Messaging.CloudEventDataFormat dataFormat = Azure.Messaging.CloudEventDataFormat.Binary) { }`
Original file line number	Diff line number	Diff line change
`@@ -54,6 +54,8 @@ public static class AzureCoreExtensions`
`54`	`54`	`/// Otherwise, it returns either an object[] or Dictionary<string, object>.`
`55`	`55`	`/// Each value in the key value pair or list will also be converted into a primitive or another complex type recursively.`
`56`	`56`	`/// </returns>`
	`57`	`+ [RequiresUnreferencedCode(DynamicData.SerializationRequiresUnreferencedCode)]`
	`58`	`+ [RequiresDynamicCode(DynamicData.SerializationRequiresUnreferencedCode)]`
`57`	`59`	`public static object? ToObjectFromJson(this BinaryData data)`
`58`	`60`	`{`
`59`	`61`	`JsonElement element = data.ToObjectFromJson<JsonElement>();`