From 4b74293ac9c9daf26bcae9aeaccd20a8465e567f Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Wed, 23 Apr 2025 17:14:05 -0700
Subject: [PATCH 01/15] bump scm version to get an alpha azure.core out

---
 eng/Packages.Data.props                       |  6 ++--
 sdk/core/Azure.Core/src/AzureCoreContext.cs   | 14 +++++++++
 .../src/RehydrationToken.Serialization.cs     |  2 +-
 .../Azure.Core/tests/RehydrationTokenTests.cs |  3 ++
 .../tests/System.ClientModel.Tests.csproj     |  1 +
 .../JsonModelConverterTests.cs                | 31 +++----------------
 .../SystemClientModelTestsInternalContext.cs  | 23 ++++++++++++++
 7 files changed, 49 insertions(+), 31 deletions(-)
 create mode 100644 sdk/core/Azure.Core/src/AzureCoreContext.cs
 create mode 100644 sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/SystemClientModelTestsInternalContext.cs

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index a9de404bfbbb..7367830f3d66 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -86,7 +86,7 @@
 
     <!-- BCL packages -->
     <PackageReference Update="System.Buffers" Version="4.5.1" />
-    <PackageReference Update="System.ClientModel" Version="1.3.0" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
     <PackageReference Update="System.IO.Hashing" Version="6.0.0" />
     <PackageReference Update="System.Memory" Version="4.5.5" />
     <PackageReference Update="System.Memory.Data" Version="6.0.1" />
@@ -207,7 +207,7 @@
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250421.4" />
-    <PackageReference Update="System.ClientModel" Version="1.3.0" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
   </ItemGroup>
 
   <!--
@@ -409,7 +409,7 @@
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
-    <PackageReference Update="System.ClientModel" Version="1.3.0" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.Pipelines" Version="4.5.1" />
diff --git a/sdk/core/Azure.Core/src/AzureCoreContext.cs b/sdk/core/Azure.Core/src/AzureCoreContext.cs
new file mode 100644
index 000000000000..d2a30a85d089
--- /dev/null
+++ b/sdk/core/Azure.Core/src/AzureCoreContext.cs
@@ -0,0 +1,14 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.ClientModel.Primitives;
+
+namespace Azure.Core
+{
+    /// <summary>
+    /// Context class used by <see cref="ModelReaderWriter"/> to read and write models in an AOT compatible way.
+    /// </summary>
+    public partial class AzureCoreContext : ModelReaderWriterContext
+    {
+    }
+}
diff --git a/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs b/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs
index 50e16fca3bde..c9a4ca9ca7c0 100644
--- a/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs
+++ b/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs
@@ -140,7 +140,7 @@ BinaryData IPersistableModel<RehydrationToken>.Write(ModelReaderWriterOptions op
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options);
+                    return ModelReaderWriter.Write(this, options, AzureCoreContext.Default);
                 default:
                     throw new FormatException($"The model {nameof(RehydrationToken)} does not support '{options.Format}' format.");
             }
diff --git a/sdk/core/Azure.Core/tests/RehydrationTokenTests.cs b/sdk/core/Azure.Core/tests/RehydrationTokenTests.cs
index f9bae237d643..6168dab4d4d1 100644
--- a/sdk/core/Azure.Core/tests/RehydrationTokenTests.cs
+++ b/sdk/core/Azure.Core/tests/RehydrationTokenTests.cs
@@ -18,8 +18,11 @@ public void ThrowOnDeserializationWithNullRehydrationToken()
         [Test]
         public void ThrowOnDeserializationWithRehydrationTokenNullRequiredMember()
         {
+            // net462 doesn't play well with validating debug asserts
+#if !NETFRAMEWORK
             var data = BinaryData.FromString("{\"requestMethod\": null}");
             Assert.That(() => ModelReaderWriter.Read(data, typeof(RehydrationToken)), Throws.Exception);
+#endif
         }
 
         [Test]
diff --git a/sdk/core/System.ClientModel/tests/System.ClientModel.Tests.csproj b/sdk/core/System.ClientModel/tests/System.ClientModel.Tests.csproj
index 3b8401a90bc6..9207777f898f 100644
--- a/sdk/core/System.ClientModel/tests/System.ClientModel.Tests.csproj
+++ b/sdk/core/System.ClientModel/tests/System.ClientModel.Tests.csproj
@@ -5,6 +5,7 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <Nullable>enable</Nullable>
+    <NoWarn>$(NoWarn);SCM0001</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/JsonModelConverterTests.cs b/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/JsonModelConverterTests.cs
index 606b8d5198f4..e8c4f50cbf35 100644
--- a/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/JsonModelConverterTests.cs
+++ b/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/JsonModelConverterTests.cs
@@ -1,14 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
-using NUnit.Framework;
 using System.ClientModel.Primitives;
 using System.ClientModel.Tests.Client.ModelReaderWriterTests.Models;
 using System.ClientModel.Tests.ModelReaderWriterTests;
 using System.Collections.Generic;
-using System.Diagnostics.CodeAnalysis;
 using System.Reflection;
 using System.Text.Json;
+using NUnit.Framework;
 
 namespace System.ClientModel.Tests.Internal.ModelReaderWriterTests
 {
@@ -148,7 +147,7 @@ public void ConvertWithMissingInfo()
         public void ConvertWithBadContext()
         {
             var options = new JsonSerializerOptions();
-            var converter = new JsonModelConverter(ModelReaderWriterOptions.Json, new BadContext());
+            var converter = new JsonModelConverter(ModelReaderWriterOptions.Json, SystemClientModelTestsInternalContext.Default);
             options.Converters.Add(converter);
             var ex = Assert.Throws<InvalidOperationException>(() => JsonSerializer.Deserialize("{}", typeof(PersistableModel), options));
             Assert.IsNotNull(ex);
@@ -211,33 +210,11 @@ private static Dictionary<string, BinaryData> GetRawData(object model)
             return (Dictionary<string, BinaryData>)propertyInfo!.GetValue(model)!;
         }
 
-        private class BadContext : ModelReaderWriterContext
-        {
-            private PersistableModelInfo? _persistableModelInfo;
-
-            protected override bool TryGetTypeBuilderCore(Type type, out ModelReaderWriterTypeBuilder? builder)
-            {
-                builder = type switch
-                {
-                    Type t when t == typeof(PersistableModel) => _persistableModelInfo ??= new(),
-                    _ => null
-                };
-                return builder is not null;
-            }
-
-            private class PersistableModelInfo : ModelReaderWriterTypeBuilder
-            {
-                protected override Type BuilderType => typeof(DoesNotImplementPersistableModel);
-
-                protected override object CreateInstance() => new DoesNotImplementPersistableModel();
-            }
-        }
-
-        private class DoesNotImplementPersistableModel
+        internal class DoesNotImplementPersistableModel
         {
         }
 
-        private class PersistableModel : IJsonModel<PersistableModel>
+        internal class PersistableModel : IJsonModel<PersistableModel>
         {
             public PersistableModel Create(ref Utf8JsonReader reader, ModelReaderWriterOptions options) => new();
 
diff --git a/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/SystemClientModelTestsInternalContext.cs b/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/SystemClientModelTestsInternalContext.cs
new file mode 100644
index 000000000000..8fe5c9dd7ae1
--- /dev/null
+++ b/sdk/core/System.ClientModel/tests/internal/ModelReaderWriter/SystemClientModelTestsInternalContext.cs
@@ -0,0 +1,23 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+using System.ClientModel.Primitives;
+using System.Collections.Generic;
+
+namespace System.ClientModel.Tests.Internal.ModelReaderWriterTests
+{
+    internal partial class SystemClientModelTestsInternalContext : ModelReaderWriterContext
+    {
+        partial void AddAdditionalFactories(Dictionary<Type, Func<ModelReaderWriterTypeBuilder>> factories)
+        {
+            factories.Add(typeof(JsonModelConverterTests.PersistableModel), () => new PersistableModelInfo());
+        }
+
+        private class PersistableModelInfo : ModelReaderWriterTypeBuilder
+        {
+            protected override Type BuilderType => typeof(JsonModelConverterTests.DoesNotImplementPersistableModel);
+
+            protected override object CreateInstance() => new JsonModelConverterTests.DoesNotImplementPersistableModel();
+        }
+    }
+}

From 009602ebf8f2f89589aa68a53ea75c3c8098dfb6 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Wed, 23 Apr 2025 17:23:26 -0700
Subject: [PATCH 02/15] update typo / api

---
 eng/Packages.Data.props                              | 2 +-
 sdk/core/Azure.Core/api/Azure.Core.net462.cs         | 6 ++++++
 sdk/core/Azure.Core/api/Azure.Core.net472.cs         | 6 ++++++
 sdk/core/Azure.Core/api/Azure.Core.net6.0.cs         | 6 ++++++
 sdk/core/Azure.Core/api/Azure.Core.net8.0.cs         | 6 ++++++
 sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs | 6 ++++++
 6 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 13d7440cfac0..04e8b799bb4c 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -207,7 +207,7 @@
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250422.2" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5 />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
   </ItemGroup>
 
   <!--
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net462.cs b/sdk/core/Azure.Core/api/Azure.Core.net462.cs
index 0d29995bdee4..f7b7063de89f 100644
--- a/sdk/core/Azure.Core/api/Azure.Core.net462.cs
+++ b/sdk/core/Azure.Core/api/Azure.Core.net462.cs
@@ -307,6 +307,12 @@ public partial struct AccessToken
         public override bool Equals(object? obj) { throw null; }
         public override int GetHashCode() { throw null; }
     }
+    public partial class AzureCoreContext : System.ClientModel.Primitives.ModelReaderWriterContext
+    {
+        internal AzureCoreContext() { }
+        public static Azure.Core.AzureCoreContext Default { get { throw null; } }
+        protected override bool TryGetTypeBuilderCore(System.Type type, out System.ClientModel.Primitives.ModelReaderWriterTypeBuilder builder) { throw null; }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct AzureLocation : System.IEquatable<Azure.Core.AzureLocation>
     {
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net472.cs b/sdk/core/Azure.Core/api/Azure.Core.net472.cs
index 0d29995bdee4..f7b7063de89f 100644
--- a/sdk/core/Azure.Core/api/Azure.Core.net472.cs
+++ b/sdk/core/Azure.Core/api/Azure.Core.net472.cs
@@ -307,6 +307,12 @@ public partial struct AccessToken
         public override bool Equals(object? obj) { throw null; }
         public override int GetHashCode() { throw null; }
     }
+    public partial class AzureCoreContext : System.ClientModel.Primitives.ModelReaderWriterContext
+    {
+        internal AzureCoreContext() { }
+        public static Azure.Core.AzureCoreContext Default { get { throw null; } }
+        protected override bool TryGetTypeBuilderCore(System.Type type, out System.ClientModel.Primitives.ModelReaderWriterTypeBuilder builder) { throw null; }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct AzureLocation : System.IEquatable<Azure.Core.AzureLocation>
     {
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net6.0.cs b/sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
index c9e3ed033f81..6be660570948 100644
--- a/sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
+++ b/sdk/core/Azure.Core/api/Azure.Core.net6.0.cs
@@ -307,6 +307,12 @@ public partial struct AccessToken
         public override bool Equals(object? obj) { throw null; }
         public override int GetHashCode() { throw null; }
     }
+    public partial class AzureCoreContext : System.ClientModel.Primitives.ModelReaderWriterContext
+    {
+        internal AzureCoreContext() { }
+        public static Azure.Core.AzureCoreContext Default { get { throw null; } }
+        protected override bool TryGetTypeBuilderCore(System.Type type, out System.ClientModel.Primitives.ModelReaderWriterTypeBuilder builder) { throw null; }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct AzureLocation : System.IEquatable<Azure.Core.AzureLocation>
     {
diff --git a/sdk/core/Azure.Core/api/Azure.Core.net8.0.cs b/sdk/core/Azure.Core/api/Azure.Core.net8.0.cs
index d0c2dc7a9b3c..d398f25c87a9 100644
--- a/sdk/core/Azure.Core/api/Azure.Core.net8.0.cs
+++ b/sdk/core/Azure.Core/api/Azure.Core.net8.0.cs
@@ -314,6 +314,12 @@ public partial struct AccessToken
         public override bool Equals(object? obj) { throw null; }
         public override int GetHashCode() { throw null; }
     }
+    public partial class AzureCoreContext : System.ClientModel.Primitives.ModelReaderWriterContext
+    {
+        internal AzureCoreContext() { }
+        public static Azure.Core.AzureCoreContext Default { get { throw null; } }
+        protected override bool TryGetTypeBuilderCore(System.Type type, out System.ClientModel.Primitives.ModelReaderWriterTypeBuilder builder) { throw null; }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct AzureLocation : System.IEquatable<Azure.Core.AzureLocation>
     {
diff --git a/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs b/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
index 0d29995bdee4..f7b7063de89f 100644
--- a/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
+++ b/sdk/core/Azure.Core/api/Azure.Core.netstandard2.0.cs
@@ -307,6 +307,12 @@ public partial struct AccessToken
         public override bool Equals(object? obj) { throw null; }
         public override int GetHashCode() { throw null; }
     }
+    public partial class AzureCoreContext : System.ClientModel.Primitives.ModelReaderWriterContext
+    {
+        internal AzureCoreContext() { }
+        public static Azure.Core.AzureCoreContext Default { get { throw null; } }
+        protected override bool TryGetTypeBuilderCore(System.Type type, out System.ClientModel.Primitives.ModelReaderWriterTypeBuilder builder) { throw null; }
+    }
     [System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Sequential)]
     public readonly partial struct AzureLocation : System.IEquatable<Azure.Core.AzureLocation>
     {

From 51000721c6a4a8ab9a6d068a59d856681b5b8845 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Wed, 23 Apr 2025 23:18:24 -0700
Subject: [PATCH 03/15] bump version

---
 eng/Packages.Data.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 04e8b799bb4c..0533cb03ec4c 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -86,7 +86,7 @@
 
     <!-- BCL packages -->
     <PackageReference Update="System.Buffers" Version="4.5.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250423.13" />
     <PackageReference Update="System.IO.Hashing" Version="6.0.0" />
     <PackageReference Update="System.Memory" Version="4.5.5" />
     <PackageReference Update="System.Memory.Data" Version="6.0.1" />
@@ -207,7 +207,7 @@
 
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250422.2" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250423.13" />
   </ItemGroup>
 
   <!--
@@ -409,7 +409,7 @@
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.5" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250423.13" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.Pipelines" Version="4.5.1" />

From b8ba0a858bea56b06407092dc807629e3dfcd21a Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Thu, 24 Apr 2025 00:22:10 -0700
Subject: [PATCH 04/15] add analyzer in internal csproj

---
 .../tests/internal/System.ClientModel.Tests.Internal.csproj      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sdk/core/System.ClientModel/tests/internal/System.ClientModel.Tests.Internal.csproj b/sdk/core/System.ClientModel/tests/internal/System.ClientModel.Tests.Internal.csproj
index 291cb90e423f..4636b1e116c0 100644
--- a/sdk/core/System.ClientModel/tests/internal/System.ClientModel.Tests.Internal.csproj
+++ b/sdk/core/System.ClientModel/tests/internal/System.ClientModel.Tests.Internal.csproj
@@ -17,6 +17,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\System.ClientModel.csproj" />
+    <ProjectReference Include="..\..\gen\System.ClientModel.SourceGeneration.csproj" ReferenceOutputAssembly="false" OutputItemType="Analyzer" />
     <ProjectReference Include="..\client\System.ClientModel.Tests.Client.csproj" />
     <ProjectReference Include="..\System.ClientModel.Tests.csproj" />
   </ItemGroup>

From d2579f067509ce93b6b1ae20158377b3ba12d05c Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Thu, 24 Apr 2025 19:42:50 -0700
Subject: [PATCH 05/15] bump scm version

---
 eng/Packages.Data.props | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index d6a3c12e3ff4..620abd8e3388 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -86,7 +86,7 @@
 
     <!-- BCL packages -->
     <PackageReference Update="System.Buffers" Version="4.5.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250423.13" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.8" />
     <PackageReference Update="System.IO.Hashing" Version="6.0.0" />
     <PackageReference Update="System.Memory" Version="4.5.5" />
     <PackageReference Update="System.Memory.Data" Version="6.0.1" />
@@ -208,7 +208,7 @@
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250422.2" />
     <PackageReference Update="Azure.Generator" Version="1.0.0-alpha.20250423.3" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250423.13" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.8" />
   </ItemGroup>
 
   <!--
@@ -410,7 +410,7 @@
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250423.13" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.8" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.Pipelines" Version="4.5.1" />

From 7245aa09780b1cd74b644c103c4aeca799c71960 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Thu, 24 Apr 2025 22:00:50 -0700
Subject: [PATCH 06/15] fix stj

---
 eng/Directory.Build.Common.targets | 1 -
 eng/Packages.Data.props            | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/eng/Directory.Build.Common.targets b/eng/Directory.Build.Common.targets
index b9f502069f58..0f8c98879efd 100644
--- a/eng/Directory.Build.Common.targets
+++ b/eng/Directory.Build.Common.targets
@@ -106,7 +106,6 @@
     <PackageReference Remove="System.Net.Http" />
     <PackageReference Remove="System.Numerics.Vectors" />
     <PackageReference Remove="System.Text.Encodings.Web" />
-    <PackageReference Remove="System.Text.Json" />
     <PackageReference Remove="System.Threading.Channels" />
     <PackageReference Remove="System.Threading.Tasks.Extensions" />
   </ItemGroup>
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 620abd8e3388..aa1a37c6793d 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -86,7 +86,7 @@
 
     <!-- BCL packages -->
     <PackageReference Update="System.Buffers" Version="4.5.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.8" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.10" />
     <PackageReference Update="System.IO.Hashing" Version="6.0.0" />
     <PackageReference Update="System.Memory" Version="4.5.5" />
     <PackageReference Update="System.Memory.Data" Version="6.0.1" />
@@ -98,7 +98,7 @@
     <PackageReference Update="System.Security.Cryptography.Cose" Version="7.0.0" />
     <PackageReference Update="System.Threading.Channels" Version="6.0.0" />
     <PackageReference Update="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageReference Update="System.Text.Json" Version="6.0.11" />
+    <PackageReference Update="System.Text.Json" Version="8.0.5" />
     <PackageReference Update="System.Text.Encodings.Web" Version="8.0.0" />
     <PackageReference Update="System.ValueTuple" Version="4.5.0" />
     <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
@@ -208,7 +208,7 @@
   <ItemGroup Condition="'$(IsGeneratorLibrary)' == 'true'">
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250422.2" />
     <PackageReference Update="Azure.Generator" Version="1.0.0-alpha.20250423.3" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.8" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.10" />
   </ItemGroup>
 
   <!--
@@ -410,7 +410,7 @@
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.8" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.10" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.Pipelines" Version="4.5.1" />

From 53be0c81fb891ba5f92ff173bc8e8e5d4b44f803 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Mon, 28 Apr 2025 16:38:24 -0700
Subject: [PATCH 07/15] update references

---
 eng/Directory.Build.Common.targets | 1 +
 eng/Packages.Data.props            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/eng/Directory.Build.Common.targets b/eng/Directory.Build.Common.targets
index 1f389f61bcdc..66c323f37ad8 100644
--- a/eng/Directory.Build.Common.targets
+++ b/eng/Directory.Build.Common.targets
@@ -105,6 +105,7 @@
     <PackageReference Remove="System.Net.Http" />
     <PackageReference Remove="System.Numerics.Vectors" />
     <PackageReference Remove="System.Text.Encodings.Web" />
+    <PackageReference Remove="System.Text.Json" />
     <PackageReference Remove="System.Threading.Channels" />
     <PackageReference Remove="System.Threading.Tasks.Extensions" />
   </ItemGroup>
diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index 23147e1075dc..ba165bc3255e 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -209,7 +209,7 @@
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250424.2" />
     <PackageReference Update="Microsoft.TypeSpec.Generator.Input" Version="1.0.0-alpha.20250424.2" />
     <PackageReference Update="Azure.Generator" Version="1.0.0-alpha.20250423.3" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.10" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.6" />
   </ItemGroup>
 
   <!--
@@ -411,7 +411,7 @@
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-alpha.20250424.10" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.6" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.Pipelines" Version="4.5.1" />

From 9182033fe6a1c4c40735b7a55edc834ecdb5a561 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Mon, 5 May 2025 09:42:36 -0700
Subject: [PATCH 08/15] update to scm 1.4.0

---
 eng/Packages.Data.props                                   | 8 ++++----
 .../src/Azure.Core.Experimental.csproj                    | 2 +-
 .../src/Azure.Core.TestFramework.csproj                   | 2 +-
 .../Azure.Core/src/Internal/GenericOperationSource.cs     | 3 +++
 .../src/Shared/NextLinkOperationImplementation.cs         | 4 ++--
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index d4fcafb7384b..b5761d5c2df8 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -86,7 +86,7 @@
 
     <!-- BCL packages -->
     <PackageReference Update="System.Buffers" Version="4.5.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.6" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0" />
     <PackageReference Update="System.IO.Hashing" Version="8.0.0" />
     <PackageReference Update="System.Memory" Version="4.5.5" />
     <PackageReference Update="System.Memory.Data" Version="6.0.1" />
@@ -209,7 +209,7 @@
     <PackageReference Update="Microsoft.TypeSpec.Generator.ClientModel" Version="1.0.0-alpha.20250501.3" />
     <PackageReference Update="Microsoft.TypeSpec.Generator.Input" Version="1.0.0-alpha.20250501.3" />
     <PackageReference Update="Azure.Generator" Version="1.0.0-alpha.20250429.2" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.6" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0" />
   </ItemGroup>
 
   <!--
@@ -278,7 +278,7 @@
   -->
   <ItemGroup>
     <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20250430.1" PrivateAssets="All" />
-    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20250310.1" PrivateAssets="All" />
+    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20250422.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <!-- Note: Upgrading the .NET SDK version needs to be synchronized with the autorest.csharp repository -->
     <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="All"/>
@@ -411,7 +411,7 @@
     <PackageReference Update="Polly.Contrib.WaitAndRetry" Version="1.1.1" />
     <PackageReference Update="Portable.BouncyCastle" Version="1.9.0" />
     <PackageReference Update="PublicApiGenerator" Version="10.0.1" />
-    <PackageReference Update="System.ClientModel" Version="1.4.0-beta.6" />
+    <PackageReference Update="System.ClientModel" Version="1.4.0" />
     <PackageReference Update="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Update="System.IO.Compression" Version="4.3.0" />
     <PackageReference Update="System.IO.Pipelines" Version="4.5.1" />
diff --git a/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj b/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj
index 611540da825a..d90f45059336 100644
--- a/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj
+++ b/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Azure.Core" />
+    <ProjectReference Include="..\..\Azure.Core\src\Azure.Core.csproj" />
     <PackageReference Include="Microsoft.CSharp" />
   </ItemGroup>
 
diff --git a/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj b/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
index 4a0b242b7bb0..13d3d1ee5e83 100644
--- a/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
+++ b/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
@@ -4,7 +4,7 @@
     <IncludeOperationsSharedSource>true</IncludeOperationsSharedSource>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Azure.Core" />
+    <ProjectReference Include="..\..\Azure.Core\src\Azure.Core.csproj" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NUnit" />
diff --git a/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs b/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs
index f400c7f6e341..0874f9260892 100644
--- a/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs
+++ b/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs
@@ -17,6 +17,9 @@ ValueTask<T> IOperationSource<T>.CreateResultAsync(Response response, Cancellati
             => new ValueTask<T>(CreateResult(response));
 
         private T CreateResult(Response response)
+            //TODO: Will add an AOT compatible overload during https://github.com/Azure/azure-sdk-for-net/issues/48294
+#pragma warning disable AZC0150 // Use ModelReaderWriter overloads with ModelReaderWriterContext
             => ModelReaderWriter.Read<T>(response.Content)!;
+#pragma warning restore AZC0150 // Use ModelReaderWriter overloads with ModelReaderWriterContext
     }
 }
diff --git a/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs b/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
index e6e080d763d4..8c9722419d59 100644
--- a/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
+++ b/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
@@ -99,7 +99,7 @@ public static IOperation Create(
 
             // TODO: Once we remove NextLinkOperationImplementation from internal shared and make it internal to Azure.Core only in https://github.com/Azure/azure-sdk-for-net/issues/43260
             // We can access the internal members from RehydrationToken directly
-            var data = ModelReaderWriter.Write(rehydrationToken!, ModelReaderWriterOptions.Json);
+            var data = ModelReaderWriter.Write(rehydrationToken!, ModelReaderWriterOptions.Json, AzureCoreContext.Default);
             using var document = JsonDocument.Parse(data);
             var lroDetails = document.RootElement;
 
@@ -228,7 +228,7 @@ public static RehydrationToken GetRehydrationToken(
             {"version":"{{RehydrationTokenVersion}}","id":{{ConstructStringValue(operationId)}},"requestMethod":"{{requestMethod}}","initialUri":"{{startRequestUri.AbsoluteUri}}","nextRequestUri":"{{nextRequestUri}}","headerSource":"{{headerSource}}","finalStateVia":"{{finalStateVia}}","lastKnownLocation":{{ConstructStringValue(lastKnownLocation)}}}
             """;
             var data = new BinaryData(json);
-            return ModelReaderWriter.Read<RehydrationToken>(data);
+            return ModelReaderWriter.Read<RehydrationToken>(data, ModelReaderWriterOptions.Json, AzureCoreContext.Default);
         }
 
         private static string? ConstructStringValue(string? value) => value is null ? "null" : $"\"{value}\"";

From 0361e44be63fdfb526d7eecb470f1b788f795914 Mon Sep 17 00:00:00 2001
From: Wes Haggard <weshaggard@users.noreply.github.com>
Date: Mon, 5 May 2025 10:26:23 -0700
Subject: [PATCH 09/15] Update Azure.AI.OpenAI.Tests.csproj

---
 sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj b/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj
index ef08f13099ee..578ad46527cb 100644
--- a/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj
+++ b/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj
@@ -24,7 +24,7 @@
       -->
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.ClientModel" />
-    <PackageReference Update="System.ClientModel" VersionOverride="1.4.0-beta.1" />
+    <PackageReference Update="System.ClientModel" />
   </ItemGroup>
 
   <ItemGroup>

From 21712d83bcc027ab92c69037d2f1e61c42c2ec8b Mon Sep 17 00:00:00 2001
From: Wes Haggard <weshaggard@users.noreply.github.com>
Date: Mon, 5 May 2025 10:28:09 -0700
Subject: [PATCH 10/15] Update Azure.AI.OpenAI.Tests.csproj

---
 sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj b/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj
index 578ad46527cb..de4c116aeff5 100644
--- a/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj
+++ b/sdk/openai/Azure.AI.OpenAI/tests/Azure.AI.OpenAI.Tests.csproj
@@ -24,7 +24,6 @@
       -->
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="System.ClientModel" />
-    <PackageReference Update="System.ClientModel" />
   </ItemGroup>
 
   <ItemGroup>

From 0dd705a75feebf9c27cd63a3d618da468c0e7552 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Mon, 5 May 2025 10:29:55 -0700
Subject: [PATCH 11/15] remove version override

---
 sdk/openai/tools/TestFramework/src/OpenAI.TestFramework.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/sdk/openai/tools/TestFramework/src/OpenAI.TestFramework.csproj b/sdk/openai/tools/TestFramework/src/OpenAI.TestFramework.csproj
index 6543070b5e9e..7bcaae509dab 100644
--- a/sdk/openai/tools/TestFramework/src/OpenAI.TestFramework.csproj
+++ b/sdk/openai/tools/TestFramework/src/OpenAI.TestFramework.csproj
@@ -20,7 +20,6 @@
     <PackageReference Include="Moq" />
     <PackageReference Include="System.ValueTuple" />
     <PackageReference Include="System.ClientModel" />
-    <PackageReference Update="System.ClientModel" VersionOverride="1.4.0-beta.1" />
   </ItemGroup>
 
   <ItemGroup>

From 8e6c1ceb2cbe7a3652309b3a815d35f17dc09f9a Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Mon, 5 May 2025 13:03:03 -0700
Subject: [PATCH 12/15] temp suppress azc0150

---
 sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj b/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj
index c5563418be7f..0789e55c3c81 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj
+++ b/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj
@@ -10,6 +10,8 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <GenerateAPIListing>true</GenerateAPIListing>
     <NoWarn>$(NoWarn);CS1591;AZC0012;AZC0102;CS8002;CS0436;AZC0112;OPENAI001;OPENAI002;AOAI001</NoWarn>
+    <!-- Needed until SCM goes GA with this fix https://github.com/Azure/azure-sdk-for-net/pull/49824 -->
+    <NoWarn>$(NoWarn);AZC0150</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>
     <Nullable>disable</Nullable>
@@ -25,7 +27,7 @@
 
   <!-- TEMP until Azure.Core is released with updated SCM version -->
   <ItemGroup>
-    <ProjectReference Include="..\..\..\core\System.ClientModel\src\System.ClientModel.csproj" />
+    <PackageReference Include="System.ClientModel" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="System.Text.Json" />

From 2b1292bac60975d08c20e0eb1396a07ad25e2c5a Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Mon, 5 May 2025 13:46:44 -0700
Subject: [PATCH 13/15] revert new analyzer until azure.core GAs

---
 eng/Packages.Data.props                                       | 2 +-
 .../src/Azure.Core.Experimental.csproj                        | 2 +-
 .../src/Azure.Core.TestFramework.csproj                       | 2 +-
 sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs    | 3 ---
 .../Azure.Core/src/Shared/NextLinkOperationImplementation.cs  | 4 ++--
 sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj         | 2 --
 6 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/eng/Packages.Data.props b/eng/Packages.Data.props
index b5761d5c2df8..51f2c9e4e2e9 100644
--- a/eng/Packages.Data.props
+++ b/eng/Packages.Data.props
@@ -278,7 +278,7 @@
   -->
   <ItemGroup>
     <PackageReference Update="Microsoft.Azure.AutoRest.CSharp" Version="3.0.0-beta.20250430.1" PrivateAssets="All" />
-    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20250422.1" PrivateAssets="All" />
+    <PackageReference Update="Azure.ClientSdk.Analyzers" Version="0.1.1-dev.20250310.1" PrivateAssets="All" />
     <PackageReference Update="coverlet.collector" Version="3.2.0" PrivateAssets="All" />
     <!-- Note: Upgrading the .NET SDK version needs to be synchronized with the autorest.csharp repository -->
     <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="All"/>
diff --git a/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj b/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj
index d90f45059336..611540da825a 100644
--- a/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj
+++ b/sdk/core/Azure.Core.Experimental/src/Azure.Core.Experimental.csproj
@@ -11,7 +11,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\Azure.Core\src\Azure.Core.csproj" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Microsoft.CSharp" />
   </ItemGroup>
 
diff --git a/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj b/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
index 13d3d1ee5e83..4a0b242b7bb0 100644
--- a/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
+++ b/sdk/core/Azure.Core.TestFramework/src/Azure.Core.TestFramework.csproj
@@ -4,7 +4,7 @@
     <IncludeOperationsSharedSource>true</IncludeOperationsSharedSource>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\Azure.Core\src\Azure.Core.csproj" />
+    <PackageReference Include="Azure.Core" />
     <PackageReference Include="Azure.Identity" />
     <PackageReference Include="Newtonsoft.Json" />
     <PackageReference Include="NUnit" />
diff --git a/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs b/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs
index 0874f9260892..f400c7f6e341 100644
--- a/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs
+++ b/sdk/core/Azure.Core/src/Internal/GenericOperationSource.cs
@@ -17,9 +17,6 @@ ValueTask<T> IOperationSource<T>.CreateResultAsync(Response response, Cancellati
             => new ValueTask<T>(CreateResult(response));
 
         private T CreateResult(Response response)
-            //TODO: Will add an AOT compatible overload during https://github.com/Azure/azure-sdk-for-net/issues/48294
-#pragma warning disable AZC0150 // Use ModelReaderWriter overloads with ModelReaderWriterContext
             => ModelReaderWriter.Read<T>(response.Content)!;
-#pragma warning restore AZC0150 // Use ModelReaderWriter overloads with ModelReaderWriterContext
     }
 }
diff --git a/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs b/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
index 8c9722419d59..72f892348c78 100644
--- a/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
+++ b/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
@@ -99,7 +99,7 @@ public static IOperation Create(
 
             // TODO: Once we remove NextLinkOperationImplementation from internal shared and make it internal to Azure.Core only in https://github.com/Azure/azure-sdk-for-net/issues/43260
             // We can access the internal members from RehydrationToken directly
-            var data = ModelReaderWriter.Write(rehydrationToken!, ModelReaderWriterOptions.Json, AzureCoreContext.Default);
+            var data = ModelReaderWriter.Write(rehydrationToken!, ModelReaderWriterOptions.Json);
             using var document = JsonDocument.Parse(data);
             var lroDetails = document.RootElement;
 
@@ -228,7 +228,7 @@ public static RehydrationToken GetRehydrationToken(
             {"version":"{{RehydrationTokenVersion}}","id":{{ConstructStringValue(operationId)}},"requestMethod":"{{requestMethod}}","initialUri":"{{startRequestUri.AbsoluteUri}}","nextRequestUri":"{{nextRequestUri}}","headerSource":"{{headerSource}}","finalStateVia":"{{finalStateVia}}","lastKnownLocation":{{ConstructStringValue(lastKnownLocation)}}}
             """;
             var data = new BinaryData(json);
-            return ModelReaderWriter.Read<RehydrationToken>(data, ModelReaderWriterOptions.Json, AzureCoreContext.Default);
+            return ModelReaderWriter.Read<RehydrationToken>(data, ModelReaderWriterOptions.Json);
         }
 
         private static string? ConstructStringValue(string? value) => value is null ? "null" : $"\"{value}\"";
diff --git a/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj b/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj
index 0789e55c3c81..443ef461bf83 100644
--- a/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj
+++ b/sdk/openai/Azure.AI.OpenAI/src/Azure.AI.OpenAI.csproj
@@ -10,8 +10,6 @@
     <TargetFrameworks>$(RequiredTargetFrameworks)</TargetFrameworks>
     <GenerateAPIListing>true</GenerateAPIListing>
     <NoWarn>$(NoWarn);CS1591;AZC0012;AZC0102;CS8002;CS0436;AZC0112;OPENAI001;OPENAI002;AOAI001</NoWarn>
-    <!-- Needed until SCM goes GA with this fix https://github.com/Azure/azure-sdk-for-net/pull/49824 -->
-    <NoWarn>$(NoWarn);AZC0150</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
     <LangVersion>preview</LangVersion>
     <Nullable>disable</Nullable>

From 646a42752013f705238c955ed158ee71af34ad87 Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Mon, 5 May 2025 14:25:22 -0700
Subject: [PATCH 14/15] revert one more context ref

---
 sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs b/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs
index c9a4ca9ca7c0..50e16fca3bde 100644
--- a/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs
+++ b/sdk/core/Azure.Core/src/RehydrationToken.Serialization.cs
@@ -140,7 +140,7 @@ BinaryData IPersistableModel<RehydrationToken>.Write(ModelReaderWriterOptions op
             switch (format)
             {
                 case "J":
-                    return ModelReaderWriter.Write(this, options, AzureCoreContext.Default);
+                    return ModelReaderWriter.Write(this, options);
                 default:
                     throw new FormatException($"The model {nameof(RehydrationToken)} does not support '{options.Format}' format.");
             }

From 46e9d8fcac5546d8f522d79d6ae77b0d8f80ebfa Mon Sep 17 00:00:00 2001
From: m-nash <64171366+m-nash@users.noreply.github.com>
Date: Tue, 6 May 2025 10:57:10 -0700
Subject: [PATCH 15/15] update proj ref swap to deal with source generation

---
 eng/Directory.Build.Common.targets                        | 8 ++++++++
 .../src/Shared/NextLinkOperationImplementation.cs         | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/eng/Directory.Build.Common.targets b/eng/Directory.Build.Common.targets
index 66c323f37ad8..6e29541576c5 100644
--- a/eng/Directory.Build.Common.targets
+++ b/eng/Directory.Build.Common.targets
@@ -195,6 +195,14 @@
 
     <!-- Add ProjectReferences -->
     <ProjectReference Include="@(ProjectsToConvert -> '%(ProjectPath)')" />
+
+    <!-- Add System.ClientModel.SourceGeneration project reference if System.ClientModel was contained in ProjectsToConvert -->
+    <_DependsOnSystemClientModel Include="@(ProjectsToConvert)" Exclude="System.ClientModel" />
+    <ProjectReference
+      Condition="'@(_DependsOnSystemClientModel)' != '@(ProjectsToConvert)'"
+      Include="$(RepoRoot)\sdk\core\System.ClientModel\gen\System.ClientModel.SourceGeneration.csproj"
+      ReferenceOutputAssembly="false"
+      OutputItemType="Analyzer" />
   </ItemGroup>
 
   <!--TODO: update build targets - ADO 5668-->
diff --git a/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs b/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
index 72f892348c78..e6e080d763d4 100644
--- a/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
+++ b/sdk/core/Azure.Core/src/Shared/NextLinkOperationImplementation.cs
@@ -228,7 +228,7 @@ public static RehydrationToken GetRehydrationToken(
             {"version":"{{RehydrationTokenVersion}}","id":{{ConstructStringValue(operationId)}},"requestMethod":"{{requestMethod}}","initialUri":"{{startRequestUri.AbsoluteUri}}","nextRequestUri":"{{nextRequestUri}}","headerSource":"{{headerSource}}","finalStateVia":"{{finalStateVia}}","lastKnownLocation":{{ConstructStringValue(lastKnownLocation)}}}
             """;
             var data = new BinaryData(json);
-            return ModelReaderWriter.Read<RehydrationToken>(data, ModelReaderWriterOptions.Json);
+            return ModelReaderWriter.Read<RehydrationToken>(data);
         }
 
         private static string? ConstructStringValue(string? value) => value is null ? "null" : $"\"{value}\"";