System.Text.Json - source generation updates (#26502)

dotnet · Oct 15, 2021 · 5074fda · 5074fda
1 parent 2ae5d5c
commit 5074fda
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 99 deletions.
diff --git a/...rd/serialization/snippets/system-text-json-source-generation/csharp/BothModesNoOptions.cs b/...rd/serialization/snippets/system-text-json-source-generation/csharp/BothModesNoOptions.cs
@@ -68,17 +68,6 @@ public static void Main()
             Console.WriteLine(jsonString);
             // output:
             //{"Date":"2019-08-01T00:00:00","TemperatureCelsius":25,"Summary":"Hot"}
-
-            // <SerializeDirect>
-            using MemoryStream stream = new();
-            using Utf8JsonWriter writer = new(stream);
-            SourceGenerationContext.Default.WeatherForecast.Serialize(
-                writer, weatherForecast);
-            writer.Flush();
-            // </SerializeDirect>
-            Console.WriteLine(Encoding.UTF8.GetString(stream.ToArray()));
-            // output:
-            //{"Date":"2019-08-01T00:00:00","TemperatureCelsius":25,"Summary":"Hot"}
         }
     }
 }

diff --git a/...erialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyNoOptions.cs b/...erialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyNoOptions.cs
@@ -33,28 +33,25 @@ public class Program
     {
         public static void Main()
         {
+            string jsonString;
             WeatherForecast weatherForecast = new()
                 { Date = DateTime.Parse("2019-08-01"), TemperatureCelsius = 25, Summary = "Hot" };
 
-            // Use a context that selects Serialization mode.
-            // <SerializeOnlyContext> 
-            using MemoryStream memoryStream1 = new();
-            using Utf8JsonWriter writer1 = new(memoryStream1);
-            SerializeOnlyContext.Default.WeatherForecast.Serialize(writer1, weatherForecast);
-            writer1.Flush();
-            // </SerializeOnlyContext> 
-            Console.WriteLine(Encoding.UTF8.GetString(memoryStream1.ToArray()));
+            // Use context that selects Serialization mode only for WeatherForecast.
+            // <SerializeWFContext>
+            jsonString = JsonSerializer.Serialize(weatherForecast,
+                SerializeOnlyWeatherForecastOnlyContext.Default.WeatherForecast);
+            // </SerializeWFContext> 
+            Console.WriteLine(jsonString);
             // output:
             //{"Date":"2019-08-01T00:00:00","TemperatureCelsius":25,"Summary":"Hot"}
 
-            // Use context that selects Serialization mode only for WeatherForecast.
-            // <SerializeWFContext> 
-            using MemoryStream memoryStream2 = new();
-            using Utf8JsonWriter writer2 = new(memoryStream2);
-            SerializeOnlyContext.Default.WeatherForecast.Serialize(writer2, weatherForecast);
-            writer2.Flush();
-            // </SerializeWFContext> 
-            Console.WriteLine(Encoding.UTF8.GetString(memoryStream2.ToArray()));
+            // Use a context that selects Serialization mode.
+            // <SerializeOnlyContext> 
+            jsonString = JsonSerializer.Serialize(weatherForecast,
+                SerializeOnlyContext.Default.WeatherForecast);
+            // </SerializeOnlyContext> 
+            Console.WriteLine(jsonString);
             // output:
             //{"Date":"2019-08-01T00:00:00","TemperatureCelsius":25,"Summary":"Hot"}
         }

diff --git a/...ialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyWithOptions.cs b/...ialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyWithOptions.cs
@@ -33,12 +33,12 @@ public static void Main()
             WeatherForecast weatherForecast = new()
                 { Date = DateTime.Parse("2019-08-01"), TemperatureCelsius = 25, Summary = "Hot" };
 
-            // Serialize using Default context
+            // Serialize using TypeInfo<TValue> provided by the context
             // and options specified by [JsonSourceGenerationOptions].
-            // <SerializeWithContext>
+            // <SerializeWithTypeInfo>
             jsonString = JsonSerializer.Serialize(
-                weatherForecast, typeof(WeatherForecast), SerializationModeOptionsContext.Default);
-            // </SerializeWithContext>
+                weatherForecast, SerializationModeOptionsContext.Default.WeatherForecast);
+            // </SerializeWithTypeInfo>
             Console.WriteLine(jsonString);
             // output:
             //{
@@ -47,30 +47,19 @@ public static void Main()
             //  "summary": "Hot"
             //}
 
-            // Serialize using TypeInfo<TValue> provided by the context
+            // Serialize using Default context
             // and options specified by [JsonSourceGenerationOptions].
-            // <SerializeWithTypeInfo>
+            // <SerializeWithContext>
             jsonString = JsonSerializer.Serialize(
-                weatherForecast, SerializationModeOptionsContext.Default.WeatherForecast);
-            // </SerializeWithTypeInfo>
+                weatherForecast, typeof(WeatherForecast), SerializationModeOptionsContext.Default);
+            // </SerializeWithContext>
             Console.WriteLine(jsonString);
             // output:
             //{
             //  "date": "2019-08-01T00:00:00",
             //  "temperatureCelsius": 0,
             //  "summary": "Hot"
             //}
-
-            // <SerializeDirect>
-            using MemoryStream stream = new();
-            using Utf8JsonWriter writer = new(stream);
-            SerializationModeOptionsContext.Default.WeatherForecast.Serialize(
-                writer, weatherForecast);
-            writer.Flush();
-            // </SerializeDirect>
-            Console.WriteLine(Encoding.UTF8.GetString(stream.ToArray()));
-            // output:
-            //{"date":"2019-08-01T00:00:00","temperatureCelsius":25,"summary":"Hot"}
         }
     }
 }

diff --git a/...alization/snippets/system-text-json-source-generation/csharp/SystemTextJsonSamples.csproj b/...alization/snippets/system-text-json-source-generation/csharp/SystemTextJsonSamples.csproj
@@ -6,8 +6,4 @@
     <StartupObject>SystemTextJsonSamples.Program</StartupObject>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.0-rc.1.21411.4" />
-  </ItemGroup>
-
 </Project>