Update JsonDocument and JsonSerializer to react to JsonWriter changes.

src/System.Text.Json/ref/System.Text.Json.cs

@@ -71,9 +71,9 @@ public readonly partial struct JsonElement
         public bool TryGetUInt32(out uint value) { throw null; }
         [System.CLSCompliantAttribute(false)]
         public bool TryGetUInt64(out ulong value) { throw null; }
-        public void WriteAsProperty(System.ReadOnlySpan<byte> utf8PropertyName, ref System.Text.Json.Utf8JsonWriter writer) { }
-        public void WriteAsProperty(System.ReadOnlySpan<char> propertyName, ref System.Text.Json.Utf8JsonWriter writer) { }
-        public void WriteAsValue(ref System.Text.Json.Utf8JsonWriter writer) { }
+        public void WriteAsProperty(System.ReadOnlySpan<byte> utf8PropertyName, System.Text.Json.Utf8JsonWriter writer) { }
+        public void WriteAsProperty(System.ReadOnlySpan<char> propertyName, System.Text.Json.Utf8JsonWriter writer) { }
+        public void WriteAsValue(System.Text.Json.Utf8JsonWriter writer) { }
         public partial struct ArrayEnumerator : System.Collections.Generic.IEnumerable<System.Text.Json.JsonElement>, System.Collections.Generic.IEnumerator<System.Text.Json.JsonElement>, System.Collections.IEnumerable, System.Collections.IEnumerator, System.IDisposable
         {
             private object _dummy;

src/System.Text.Json/src/System.Text.Json.csproj

@@ -90,7 +90,6 @@
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.HandleEnumerable.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.HandleObject.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.String.cs" />
-    <Compile Include="System\Text\Json\Serialization\JsonSerializer.Write.HandleValue.cs" />
     <Compile Include="System\Text\Json\Serialization\JsonSerializerOptions.cs" />
     <Compile Include="System\Text\Json\Serialization\Policies\JsonValueConverter.cs" />
     <Compile Include="System\Text\Json\Serialization\PooledBufferWriter.cs" />

src/System.Text.Json/src/System/Text/Json/Document/JsonDocument.cs

@@ -603,7 +603,7 @@ internal JsonElement CloneElement(int index)
         /// </summary>
         internal void WriteElementTo(
             int index,
-            ref Utf8JsonWriter writer,
+            Utf8JsonWriter writer,
             ReadOnlySpan<char> propertyName)
         {
             CheckNotDisposed();
@@ -614,14 +614,14 @@ internal void WriteElementTo(
             {
                 case JsonTokenType.StartObject:
                     writer.WriteStartObject(propertyName);
-                    WriteComplexElement(index, ref writer);
+                    WriteComplexElement(index, writer);
                     return;
                 case JsonTokenType.StartArray:
                     writer.WriteStartArray(propertyName);
-                    WriteComplexElement(index, ref writer);
+                    WriteComplexElement(index, writer);
                     return;
                 case JsonTokenType.String:
-                    WriteString(propertyName, row, ref writer);
+                    WriteString(propertyName, row, writer);
                     return;
                 case JsonTokenType.True:
                     writer.WriteBoolean(propertyName, value: true);
@@ -647,7 +647,7 @@ internal void WriteElementTo(
         /// </summary>
         internal void WriteElementTo(
             int index,
-            ref Utf8JsonWriter writer,
+            Utf8JsonWriter writer,
             ReadOnlySpan<byte> propertyName)
         {
             CheckNotDisposed();
@@ -658,14 +658,14 @@ internal void WriteElementTo(
             {
                 case JsonTokenType.StartObject:
                     writer.WriteStartObject(propertyName);
-                    WriteComplexElement(index, ref writer);
+                    WriteComplexElement(index, writer);
                     return;
                 case JsonTokenType.StartArray:
                     writer.WriteStartArray(propertyName);
-                    WriteComplexElement(index, ref writer);
+                    WriteComplexElement(index, writer);
                     return;
                 case JsonTokenType.String:
-                    WriteString(propertyName, row, ref writer);
+                    WriteString(propertyName, row, writer);
                     return;
                 case JsonTokenType.True:
                     writer.WriteBoolean(propertyName, value: true);
@@ -691,7 +691,7 @@ internal void WriteElementTo(
         /// </summary>
         internal void WriteElementTo(
             int index,
-            ref Utf8JsonWriter writer)
+            Utf8JsonWriter writer)
         {
             CheckNotDisposed();
 
@@ -701,14 +701,14 @@ internal void WriteElementTo(
             {
                 case JsonTokenType.StartObject:
                     writer.WriteStartObject();
-                    WriteComplexElement(index, ref writer);
+                    WriteComplexElement(index, writer);
                     return;
                 case JsonTokenType.StartArray:
                     writer.WriteStartArray();
-                    WriteComplexElement(index, ref writer);
+                    WriteComplexElement(index, writer);
                     return;
                 case JsonTokenType.String:
-                    WriteString(row, ref writer);
+                    WriteString(row, writer);
                     return;
                 case JsonTokenType.Number:
                     writer.WriteNumberValue(_utf8Json.Slice(row.Location, row.SizeOrLength).Span);
@@ -727,7 +727,7 @@ internal void WriteElementTo(
             Debug.Fail($"Unexpected encounter with JsonTokenType {row.TokenType}");
         }
 
-        private void WriteComplexElement(int index, ref Utf8JsonWriter writer)
+        private void WriteComplexElement(int index, Utf8JsonWriter writer)
         {
             int endIndex = GetEndIndex(index, true);
 
@@ -739,7 +739,7 @@ private void WriteComplexElement(int index, ref Utf8JsonWriter writer)
                 switch (row.TokenType)
                 {
                     case JsonTokenType.String:
-                        WriteString(row, ref writer);
+                        WriteString(row, writer);
                         continue;
                     case JsonTokenType.Number:
                         writer.WriteNumberValue(_utf8Json.Slice(row.Location, row.SizeOrLength).Span);
@@ -778,7 +778,7 @@ private void WriteComplexElement(int index, ref Utf8JsonWriter writer)
                         switch (propertyValue.TokenType)
                         {
                             case JsonTokenType.String:
-                                WriteString(propertyName, propertyValue, ref writer);
+                                WriteString(propertyName, propertyValue, writer);
                                 continue;
                             case JsonTokenType.Number:
                                 writer.WriteNumber(
@@ -844,7 +844,7 @@ private static void ClearAndReturn(ArraySegment<byte> rented)
             }
         }
 
-        private void WriteString(ReadOnlySpan<byte> propertyName, in DbRow row, ref Utf8JsonWriter writer)
+        private void WriteString(ReadOnlySpan<byte> propertyName, in DbRow row, Utf8JsonWriter writer)
         {
             ArraySegment<byte> rented = default;
 
@@ -860,7 +860,7 @@ private void WriteString(ReadOnlySpan<byte> propertyName, in DbRow row, ref Utf8
             }
         }
 
-        private void WriteString(ReadOnlySpan<char> propertyName, in DbRow row, ref Utf8JsonWriter writer)
+        private void WriteString(ReadOnlySpan<char> propertyName, in DbRow row, Utf8JsonWriter writer)
         {
             ArraySegment<byte> rented = default;
 
@@ -877,7 +877,7 @@ private void WriteString(ReadOnlySpan<char> propertyName, in DbRow row, ref Utf8
             }
         }
 
-        private void WriteString(in DbRow row, ref Utf8JsonWriter writer)
+        private void WriteString(in DbRow row, Utf8JsonWriter writer)
         {
             ArraySegment<byte> rented = default;
 

src/System.Text.Json/src/System/Text/Json/Document/JsonElement.cs

@@ -940,11 +940,11 @@ internal string GetPropertyRawText()
         /// <exception cref="ObjectDisposedException">
         ///   The parent <see cref="JsonDocument"/> has been disposed.
         /// </exception>
-        public void WriteAsProperty(ReadOnlySpan<char> propertyName, ref Utf8JsonWriter writer)
+        public void WriteAsProperty(ReadOnlySpan<char> propertyName, Utf8JsonWriter writer)
         {
             CheckValidInstance();
 
-            _parent.WriteElementTo(_idx, ref writer, propertyName);
+            _parent.WriteElementTo(_idx, writer, propertyName);
         }
 
         /// <summary>
@@ -960,11 +960,11 @@ public void WriteAsProperty(ReadOnlySpan<char> propertyName, ref Utf8JsonWriter
         /// <exception cref="ObjectDisposedException">
         ///   The parent <see cref="JsonDocument"/> has been disposed.
         /// </exception>
-        public void WriteAsProperty(ReadOnlySpan<byte> utf8PropertyName, ref Utf8JsonWriter writer)
+        public void WriteAsProperty(ReadOnlySpan<byte> utf8PropertyName, Utf8JsonWriter writer)
         {
             CheckValidInstance();
 
-            _parent.WriteElementTo(_idx, ref writer, utf8PropertyName);
+            _parent.WriteElementTo(_idx, writer, utf8PropertyName);
         }
 
         /// <summary>
@@ -977,11 +977,11 @@ public void WriteAsProperty(ReadOnlySpan<byte> utf8PropertyName, ref Utf8JsonWri
         /// <exception cref="ObjectDisposedException">
         ///   The parent <see cref="JsonDocument"/> has been disposed.
         /// </exception>
-        public void WriteAsValue(ref Utf8JsonWriter writer)
+        public void WriteAsValue(Utf8JsonWriter writer)
         {
             CheckValidInstance();
 
-            _parent.WriteElementTo(_idx, ref writer);
+            _parent.WriteElementTo(_idx, writer);
         }
 
         /// <summary>

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterBoolean.cs

@@ -20,12 +20,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out bool
             return true;
         }
 
-        public override void Write(bool value, ref Utf8JsonWriter writer)
+        public override void Write(bool value, Utf8JsonWriter writer)
         {
             writer.WriteBooleanValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, bool value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, bool value, Utf8JsonWriter writer)
         {
             writer.WriteBoolean(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterByte.cs

@@ -22,12 +22,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out byte
             return true;
         }
 
-        public override void Write(byte value, ref Utf8JsonWriter writer)
+        public override void Write(byte value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, byte value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, byte value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterChar.cs

@@ -21,20 +21,20 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out char
             return true;
         }
 
-        public override void Write(char value, ref Utf8JsonWriter writer)
+        public override void Write(char value, Utf8JsonWriter writer)
         {
 #if BUILDING_INBOX_LIBRARY
-            Span<char> temp = MemoryMarshal.CreateSpan<char>(ref value, 1);
+            Span<char> temp = MemoryMarshal.CreateSpan(ref value, 1);
             writer.WriteStringValue(temp);
 #else
             writer.WriteStringValue(value.ToString());
 #endif
         }
 
-        public override void Write(Span<byte> escapedPropertyName, char value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, char value, Utf8JsonWriter writer)
         {
 #if BUILDING_INBOX_LIBRARY
-            Span<char> temp = MemoryMarshal.CreateSpan<char>(ref value, 1);
+            Span<char> temp = MemoryMarshal.CreateSpan(ref value, 1);
             writer.WriteString(escapedPropertyName, temp);
 #else
             writer.WriteString(escapedPropertyName, value.ToString());

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDateTime.cs

@@ -13,12 +13,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out Date
             return reader.TryGetDateTime(out value);
         }
 
-        public override void Write(DateTime value, ref Utf8JsonWriter writer)
+        public override void Write(DateTime value, Utf8JsonWriter writer)
         {
             writer.WriteStringValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, DateTime value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, DateTime value, Utf8JsonWriter writer)
         {
             writer.WriteString(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDateTimeOffset.cs

@@ -13,12 +13,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out Date
             return reader.TryGetDateTimeOffset(out value);
         }
 
-        public override void Write(DateTimeOffset value, ref Utf8JsonWriter writer)
+        public override void Write(DateTimeOffset value, Utf8JsonWriter writer)
         {
             writer.WriteStringValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, DateTimeOffset value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, DateTimeOffset value, Utf8JsonWriter writer)
         {
             writer.WriteString(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDecimal.cs

@@ -19,12 +19,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out deci
             return reader.TryGetDecimal(out value);
         }
 
-        public override void Write(decimal value, ref Utf8JsonWriter writer)
+        public override void Write(decimal value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, decimal value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, decimal value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterDouble.cs

@@ -19,12 +19,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out doub
             return reader.TryGetDouble(out value);
         }
 
-        public override void Write(double value, ref Utf8JsonWriter writer)
+        public override void Write(double value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, double value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, double value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterEnum.cs

@@ -44,7 +44,7 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out TVal
             return true;
         }
 
-        public override void Write(TValue value, ref Utf8JsonWriter writer)
+        public override void Write(TValue value, Utf8JsonWriter writer)
         {
             if (TreatAsString)
             {
@@ -64,7 +64,7 @@ public override void Write(TValue value, ref Utf8JsonWriter writer)
             }
         }
 
-        public override void Write(Span<byte> escapedPropertyName, TValue value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, TValue value, Utf8JsonWriter writer)
         {
             if (TreatAsString)
             {

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt16.cs

@@ -22,12 +22,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out shor
             return true;
         }
 
-        public override void Write(short value, ref Utf8JsonWriter writer)
+        public override void Write(short value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, short value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, short value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt32.cs

@@ -19,12 +19,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out int
             return reader.TryGetInt32(out value);
         }
 
-        public override void Write(int value, ref Utf8JsonWriter writer)
+        public override void Write(int value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, int value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, int value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterInt64.cs

@@ -19,12 +19,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out long
             return reader.TryGetInt64(out value);
         }
 
-        public override void Write(long value, ref Utf8JsonWriter writer)
+        public override void Write(long value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, long value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, long value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }

src/System.Text.Json/src/System/Text/Json/Serialization/Converters/JsonValueConverterSByte.cs

@@ -22,12 +22,12 @@ public override bool TryRead(Type valueType, ref Utf8JsonReader reader, out sbyt
             return true;
         }
 
-        public override void Write(sbyte value, ref Utf8JsonWriter writer)
+        public override void Write(sbyte value, Utf8JsonWriter writer)
         {
             writer.WriteNumberValue(value);
         }
 
-        public override void Write(Span<byte> escapedPropertyName, sbyte value, ref Utf8JsonWriter writer)
+        public override void Write(Span<byte> escapedPropertyName, sbyte value, Utf8JsonWriter writer)
         {
             writer.WriteNumber(escapedPropertyName, value);
         }