Use new mrw overloads (#5297)

* update to use new mrw overloads

* regen after changes

* regen after merge

* pull in new version and shared source

* temp use alternate branch

* missed one branch

* bump to latest

* bump version and regen

* bump version of scm and ac

* bump versions to ga

* regen after update

* upgrade to 9/8/462 for test projects

* regen after spec update

* make conditional more clear

Author: m-nash

Directory.Build.props

@@ -23,6 +23,9 @@
     <NoWarn Condition="'$(IsUnbranded)' == 'true'">AZC0107</NoWarn>
     <NoWarn Condition="'$(IsNoDocProject)' == 'true'">$(NoWarn);CS1591</NoWarn>
     <NoWarn Condition="'$(IsTestGenerationSampleProject)' == 'true'">$(NoWarn);CS1591</NoWarn>
+    <!-- Since Resource classes implement IPersistableModel and don't have a public or internal parameterless ctor we need to suppress this -->
+    <!-- We should consider fixing this in the future for more info see https://aka.ms/system-clientmodel/diagnostics#scm0005 -->
+    <NoWarn Condition="'$(IsMgmtLibrary)' == 'true'">$(NoWarn);SCM0005</NoWarn>
     <IncludeSharedSourceInLocalBuild Condition="!$(MSBuildProjectName.StartsWith('AutoRest.')) And '$(IsTestGenerationTestProject)' != 'true'">true</IncludeSharedSourceInLocalBuild>
   </PropertyGroup>
 

Directory.Build.targets

@@ -21,37 +21,38 @@
 
   <ItemGroup Condition="$(MSBuildProjectName.EndsWith('.Tests'))">
     <PackageReference Update="Azure.Identity" Version="1.11.4" />
-    <PackageReference Update="NUnit3TestAdapter" Version="4.4.2" />
     <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Update="NUnit3TestAdapter" Version="4.4.2" />
   </ItemGroup>
 
   <!-- Library only dependencies. -->
   <ItemGroup Condition="'$(IsTestGenerationSrcProject)' == 'true'">
     <PackageReference Update="System.Text.Json" Version="4.7.2" />
 
     <!-- Include analyzers so that we see issues in this repo before we do a regen preview-->
-    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20240813.2" PrivateAssets="All" />
-    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20250422.1" PrivateAssets="All" />
     <PackageReference Update="Microsoft.CodeAnalysis.BannedApiAnalyzers" Version="3.3.2" PrivateAssets="All" />
+    <PackageReference Update="Microsoft.CodeAnalysis.NetAnalyzers" Version="9.0.0" PrivateAssets="All" />
   </ItemGroup>
 
   <!-- All csproj dependencies. -->
   <ItemGroup>
-    <PackageReference Update="NUnit" Version="3.13.2" />
-    <PackageReference Update="System.ClientModel" Version="1.1.0-beta.3" />
-    <PackageReference Update="Azure.Core" Version="1.42.0" />
+    <PackageReference Update="Azure.Core" Version="1.46.0" />
     <PackageReference Update="Azure.Core.Experimental" Version="0.1.0-preview.18" />
-    <PackageReference Update="Azure.ResourceManager" Version="1.13.0" />
     <PackageReference Update="Azure.Core.Expressions.DataFactory" Version="1.0.0" />
-    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.1" />
+    <PackageReference Update="Azure.ResourceManager" Version="1.13.0" />
     <PackageReference Update="CommandLineParser" Version="2.9.1" />
     <PackageReference Update="Humanizer.Core" Version="2.13.14" />
+    <PackageReference Update="Microsoft.AspNetCore.Server.Kestrel" Version="2.2.0" />
+    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
+    <PackageReference Update="Microsoft.Build" Version="16.11.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.1.0" />
-    <PackageReference Update="System.Text.Json" Version="6.0.10" />
-    <PackageReference Update="YamlDotNet" Version="11.2.1" />
-    <PackageReference Update="System.Memory" Version="4.5.4" />
     <PackageReference Update="NuGet.Configuration" Version="6.8.0" />
-    <PackageReference Update="Microsoft.Build" Version="16.11.0" />
+    <PackageReference Update="NUnit" Version="3.13.2" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="8.0.0" />
+    <PackageReference Update="System.Memory" Version="4.5.4" />
+    <PackageReference Update="System.Text.Json" Version="8.0.5" />
+    <PackageReference Update="YamlDotNet" Version="11.2.1" />
   </ItemGroup>
 </Project>

Packages.Data.props

@@ -20,6 +20,7 @@ internal static class ModelSerializationExtensions
     {
         internal static readonly JsonDocumentOptions JsonDocumentOptions = new JsonDocumentOptions { MaxDepth = 256 };
         internal static readonly ModelReaderWriterOptions WireOptions = new ModelReaderWriterOptions("W");
+        internal static readonly BinaryData SentinelValue = BinaryData.FromBytes("\"__EMPTY__\""u8.ToArray());
 
         public static object GetObject(this JsonElement element)
         {
@@ -257,6 +258,13 @@ public static void WriteObjectValue(this Utf8JsonWriter writer, object value, Mo
             writer.WriteObjectValue<object>(value, options);
         }
 
+        internal static bool IsSentinelValue(BinaryData value)
+        {
+            ReadOnlySpan<byte> sentinelSpan = SentinelValue.ToMemory().Span;
+            ReadOnlySpan<byte> valueSpan = value.ToMemory().Span;
+            return sentinelSpan.SequenceEqual(valueSpan);
+        }
+
         internal static class TypeFormatters
         {
             private const string RoundtripZFormat = "yyyy-MM-ddTHH:mm:ss.fffffffZ";

samples/AnomalyDetector/src/AnomalyDetector.csproj

@@ -137,7 +137,7 @@ BinaryData IPersistableModel<AlignPolicy>.Write(ModelReaderWriterOptions options
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options, AnomalyDetectorContext.Default);
                 default:
                     throw new FormatException($"The model {nameof(AlignPolicy)} does not support writing '{options.Format}' format.");
             }

samples/AnomalyDetector/src/Generated/Internal/ModelSerializationExtensions.cs

@@ -134,7 +134,7 @@ BinaryData IPersistableModel<AnomalyDetectionModel>.Write(ModelReaderWriterOptio
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options, AnomalyDetectorContext.Default);
                 default:
                     throw new FormatException($"The model {nameof(AnomalyDetectionModel)} does not support writing '{options.Format}' format.");
             }

samples/AnomalyDetector/src/Generated/Models/AlignPolicy.Serialization.cs

@@ -0,0 +1,19 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+// <auto-generated/>
+
+#nullable disable
+
+using System.ClientModel.Primitives;
+
+namespace AnomalyDetector
+{
+    /// <summary>
+    /// Context class which will be filled in by the System.ClientModel.SourceGeneration.
+    /// For more information see 'https://github.com/Azure/azure-sdk-for-net/blob/main/sdk/core/System.ClientModel/src/docs/ModelReaderWriterContext.md'
+    /// </summary>
+    public partial class AnomalyDetectorContext : ModelReaderWriterContext
+    {
+    }
+}

samples/AnomalyDetector/src/Generated/Models/AnomalyDetectionModel.Serialization.cs

@@ -133,7 +133,7 @@ BinaryData IPersistableModel<AnomalyInterpretation>.Write(ModelReaderWriterOptio
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options, AnomalyDetectorContext.Default);
                 default:
                     throw new FormatException($"The model {nameof(AnomalyInterpretation)} does not support writing '{options.Format}' format.");
             }

samples/AnomalyDetector/src/Generated/Models/AnomalyDetectorContext.cs

@@ -140,7 +140,7 @@ BinaryData IPersistableModel<AnomalyState>.Write(ModelReaderWriterOptions option
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options, AnomalyDetectorContext.Default);
                 default:
                     throw new FormatException($"The model {nameof(AnomalyState)} does not support writing '{options.Format}' format.");
             }