System.Text.Json - NRT for .NET 6 samples (dotnet#26732)

tdykstra · web-flow · commit 873111bf06ae · 2021-11-03T11:32:50.000-07:00
diff --git a/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/Callbacks.cs b/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/Callbacks.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Text.Json;
+﻿using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace Callbacks
@@ -10,7 +9,7 @@ public class WeatherForecast :
     {
         public DateTime Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
 
         void IJsonOnDeserializing.OnDeserializing() => Console.WriteLine("\nBegin deserializing");
         void IJsonOnDeserialized.OnDeserialized()
@@ -48,9 +47,9 @@ public static void Main()
             Console.WriteLine(jsonString);
 
             weatherForecast = JsonSerializer.Deserialize<WeatherForecast>(jsonString);
-            Console.WriteLine($"Date={weatherForecast.Date}");
-            Console.WriteLine($"TemperatureCelsius={weatherForecast.TemperatureCelsius}");
-            Console.WriteLine($"Summary={weatherForecast.Summary}");
+            Console.WriteLine($"Date={weatherForecast?.Date}");
+            Console.WriteLine($"TemperatureCelsius={weatherForecast?.TemperatureCelsius}");
+            Console.WriteLine($"Summary={weatherForecast?.Summary}");
         }
     }
 }
diff --git a/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/Program.cs b/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/Program.cs
@@ -1,13 +1,8 @@
-﻿using System;
-using System.IO;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace SystemTextJsonSamples
+﻿namespace SystemTextJsonSamples
 {
     public class Program
     {
-        static async Task Main()
+        static void Main()
         {
             Console.WriteLine("\n============================= Round trip to JsonElementAndNode\n");
             RoundtripJsonElementAndNode.Program.Main();
diff --git a/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/PropertyOrder.cs b/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/PropertyOrder.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Text.Json;
+﻿using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace PropertyOrder
@@ -12,7 +11,7 @@ public class WeatherForecast
         [JsonPropertyOrder(-2)]
         public int TemperatureF { get; set; }
         [JsonPropertyOrder(5)]
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
         [JsonPropertyOrder(2)]
         public int WindSpeed { get; set; }
     }
diff --git a/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/RoundtripJsonElementAndNode.cs b/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/RoundtripJsonElementAndNode.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Text.Json;
+﻿using System.Text.Json;
 using System.Text.Json.Nodes;
 
 namespace RoundtripJsonElementAndNode
@@ -8,9 +7,9 @@ public class WeatherForecast
     {
         public DateTimeOffset Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
         public JsonElement DatesAvailable { get; set; }
-        public JsonNode SummaryWords { get; set; }
+        public JsonNode? SummaryWords { get; set; }
     }
         public class Program
     {
@@ -31,7 +30,7 @@ public static void Main()
     ""Humid""
   ]
 }";
-            WeatherForecast weatherForecast = 
+            WeatherForecast? weatherForecast = 
                 JsonSerializer.Deserialize<WeatherForecast>(jsonString);
 
             var serializeOptions = new JsonSerializerOptions { WriteIndented = true };
diff --git a/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/SerializeIgnoreCycles.cs b/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/SerializeIgnoreCycles.cs
@@ -1,15 +1,13 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Text.Json;
+﻿using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace SerializeIgnoreCycles
 {
     public class Employee
     {
-        public string Name { get; set; }
-        public Employee Manager { get; set; }
-        public List<Employee> DirectReports { get; set; }
+        public string? Name { get; set; }
+        public Employee? Manager { get; set; }
+        public List<Employee>? DirectReports { get; set; }
     }
 
     public class Program
@@ -38,13 +36,13 @@ public static void Main()
             string tylerJson = JsonSerializer.Serialize(tyler, options);
             Console.WriteLine($"Tyler serialized:\n{tylerJson}");
 
-            Employee tylerDeserialized =
+            Employee? tylerDeserialized =
                 JsonSerializer.Deserialize<Employee>(tylerJson, options);
 
             Console.WriteLine(
                 "Tyler is manager of Tyler's first direct report: ");
             Console.WriteLine(
-                tylerDeserialized.DirectReports[0].Manager == tylerDeserialized);
+                tylerDeserialized?.DirectReports?[0]?.Manager == tylerDeserialized);
         }
     }
 }
diff --git a/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/SystemTextJsonSamples.csproj b/docs/standard/serialization/snippets/system-text-json-how-to-6-0/csharp/SystemTextJsonSamples.csproj
@@ -4,6 +4,8 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <StartupObject>SystemTextJsonSamples.Program</StartupObject>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
 </Project>
diff --git a/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/BothModesNoOptions.cs b/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/BothModesNoOptions.cs
@@ -1,7 +1,4 @@
 ﻿// <All>
-using System;
-using System.IO;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -12,7 +9,7 @@ public class WeatherForecast
     {
         public DateTime Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
     }
     // </WF>
 
@@ -35,27 +32,28 @@ public static void Main()
   ""Summary"": ""Hot""
 }
 ";
-            WeatherForecast weatherForecast;
+            WeatherForecast? weatherForecast;
 
             // <DeserializeWithTypeInfo>
             weatherForecast = JsonSerializer.Deserialize<WeatherForecast>(
                 jsonString, SourceGenerationContext.Default.WeatherForecast);
             // </DeserializeWithTypeInfo>
-            Console.WriteLine($"Date={weatherForecast.Date}");
+            Console.WriteLine($"Date={weatherForecast?.Date}");
             // output:
             //Date=8/1/2019 12:00:00 AM
 
             // <DeserializeWithContext>
-            weatherForecast = (WeatherForecast)JsonSerializer.Deserialize(
-                jsonString, typeof(WeatherForecast), SourceGenerationContext.Default);
+            weatherForecast = JsonSerializer.Deserialize(
+                jsonString, typeof(WeatherForecast), SourceGenerationContext.Default)
+                as WeatherForecast;
             // </DeserializeWithContext>
-            Console.WriteLine($"Date={weatherForecast.Date}");
+            Console.WriteLine($"Date={weatherForecast?.Date}");
             // output:
             //Date=8/1/2019 12:00:00 AM
 
             // <SerializeWithTypeInfo>
             jsonString = JsonSerializer.Serialize(
-                weatherForecast, SourceGenerationContext.Default.WeatherForecast);
+                weatherForecast!, SourceGenerationContext.Default.WeatherForecast);
             // </SerializeWithTypeInfo>
             Console.WriteLine(jsonString);
             // output:
diff --git a/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/JsonSerializerOptionsExample.cs b/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/JsonSerializerOptionsExample.cs
@@ -1,5 +1,4 @@
 ﻿// <All>
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -9,7 +8,7 @@ public class WeatherForecast
     {
         public DateTime Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
     }
 
     // <DefineContext>
@@ -30,16 +29,17 @@ public static void Main()
   ""summary"": ""Hot""
 }
 ";
-            WeatherForecast weatherForecast;
+            WeatherForecast? weatherForecast;
 
             // <Deserialize>
-            weatherForecast = (WeatherForecast)JsonSerializer.Deserialize(
+            weatherForecast = JsonSerializer.Deserialize(
                 jsonString, 
                 typeof(WeatherForecast), 
                 new OptionsExampleContext(
-                    new JsonSerializerOptions(JsonSerializerDefaults.Web)));
+                    new JsonSerializerOptions(JsonSerializerDefaults.Web)))
+                    as WeatherForecast;
             // </Deserialize>
-            Console.WriteLine($"Date={weatherForecast.Date}");
+            Console.WriteLine($"Date={weatherForecast?.Date}");
             // output:
             //Date=8/1/2019 12:00:00 AM
 
diff --git a/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/MetadataOnlyNoOptions.cs b/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/MetadataOnlyNoOptions.cs
@@ -1,5 +1,4 @@
 ﻿// <All>
-using System;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -9,7 +8,7 @@ public class WeatherForecast
     {
         public DateTime Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
     }
 
     // <JsonSerializableGenMode>
@@ -38,21 +37,21 @@ public static void Main()
   ""Summary"": ""Hot""
 }
 ";
-            WeatherForecast weatherForecast;
+            WeatherForecast? weatherForecast;
 
             // Deserialize with context that selects metadata mode only for WeatherForecast only.
             // <DeserializeWFContext> 
             weatherForecast = JsonSerializer.Deserialize<WeatherForecast>(
                 jsonString, MetadataOnlyWeatherForecastOnlyContext.Default.WeatherForecast);
             // </DeserializeWFContext> 
-            Console.WriteLine($"Date={weatherForecast.Date}");
+            Console.WriteLine($"Date={weatherForecast?.Date}");
             // output:
             //Date=8/1/2019 12:00:00 AM
 
             // Serialize with context that selects metadata mode only for WeatherForecast only.
             // <SerializeWFContext> 
             jsonString = JsonSerializer.Serialize(
-                weatherForecast,
+                weatherForecast!,
                 MetadataOnlyWeatherForecastOnlyContext.Default.WeatherForecast);
             // </SerializeWFContext> 
             Console.WriteLine(jsonString);
@@ -64,14 +63,14 @@ public static void Main()
             weatherForecast = JsonSerializer.Deserialize<WeatherForecast>(
                 jsonString, MetadataOnlyContext.Default.WeatherForecast);
             // </DeserializeMetadataOnlyContext> 
-            Console.WriteLine($"Date={weatherForecast.Date}");
+            Console.WriteLine($"Date={weatherForecast?.Date}");
             // output:
             //Date=8/1/2019 12:00:00 AM
 
             // Serialize with context that selects metadata mode only.
             // <SerializeMetadataOnlyContext>
             jsonString = JsonSerializer.Serialize(
-                weatherForecast, MetadataOnlyContext.Default.WeatherForecast);
+                weatherForecast!, MetadataOnlyContext.Default.WeatherForecast);
             // </SerializeMetadataOnlyContext>
             Console.WriteLine(jsonString);
             // output:
diff --git a/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyNoOptions.cs b/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyNoOptions.cs
@@ -1,7 +1,4 @@
 ﻿// <All>
-using System;
-using System.IO;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -11,7 +8,7 @@ public class WeatherForecast
     {
         public DateTime Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
     }
 
     // <JsonSourceGenerationOptionsGenmode>
diff --git a/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyWithOptions.cs b/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/SerializeOnlyWithOptions.cs
@@ -1,8 +1,4 @@
 ﻿// <All>
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
 
@@ -12,7 +8,7 @@ public class WeatherForecast
     {
         public DateTime Date { get; set; }
         public int TemperatureCelsius { get; set; }
-        public string Summary { get; set; }
+        public string? Summary { get; set; }
     }
 
     // <JsonSourceGenerationOptions>
diff --git a/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/SystemTextJsonSamples.csproj b/docs/standard/serialization/snippets/system-text-json-source-generation/csharp/SystemTextJsonSamples.csproj
@@ -4,6 +4,8 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>net6.0</TargetFramework>
     <StartupObject>SystemTextJsonSamples.Program</StartupObject>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
   </PropertyGroup>
 
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Text.Json;`
	`1`	`+using System.Text.Json;`
`3`	`2`	`using System.Text.Json.Serialization;`
`4`	`3`
`5`	`4`	`namespace Callbacks`
`@@ -10,7 +9,7 @@ public class WeatherForecast :`
`10`	`9`	`{`
`11`	`10`	`public DateTime Date { get; set; }`
`12`	`11`	`public int TemperatureCelsius { get; set; }`
`13`		`- public string Summary { get; set; }`
	`12`	`+ public string? Summary { get; set; }`
`14`	`13`
`15`	`14`	`void IJsonOnDeserializing.OnDeserializing() => Console.WriteLine("\nBegin deserializing");`
`16`	`15`	`void IJsonOnDeserialized.OnDeserialized()`
`@@ -48,9 +47,9 @@ public static void Main()`
`48`	`47`	`Console.WriteLine(jsonString);`
`49`	`48`
`50`	`49`	`weatherForecast = JsonSerializer.Deserialize<WeatherForecast>(jsonString);`
`51`		`- Console.WriteLine($"Date={weatherForecast.Date}");`
`52`		`- Console.WriteLine($"TemperatureCelsius={weatherForecast.TemperatureCelsius}");`
`53`		`- Console.WriteLine($"Summary={weatherForecast.Summary}");`
	`50`	`+ Console.WriteLine($"Date={weatherForecast?.Date}");`
	`51`	`+ Console.WriteLine($"TemperatureCelsius={weatherForecast?.TemperatureCelsius}");`
	`52`	`+ Console.WriteLine($"Summary={weatherForecast?.Summary}");`
`54`	`53`	`}`
`55`	`54`	`}`
`56`	`55`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,13 +1,8 @@`
`1`		`-using System;`
`2`		`-using System.IO;`
`3`		`-using System.Text;`
`4`		`-using System.Threading.Tasks;`
`5`		`-`
`6`		`-namespace SystemTextJsonSamples`
	`1`	`+namespace SystemTextJsonSamples`
`7`	`2`	`{`
`8`	`3`	`public class Program`
`9`	`4`	`{`
`10`		`- static async Task Main()`
	`5`	`+ static void Main()`
`11`	`6`	`{`
`12`	`7`	`Console.WriteLine("\n============================= Round trip to JsonElementAndNode\n");`
`13`	`8`	`RoundtripJsonElementAndNode.Program.Main();`
Original file line number	Diff line number	Diff line change
`@@ -1,15 +1,13 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text.Json;`
	`1`	`+using System.Text.Json;`
`4`	`2`	`using System.Text.Json.Serialization;`
`5`	`3`
`6`	`4`	`namespace SerializeIgnoreCycles`
`7`	`5`	`{`
`8`	`6`	`public class Employee`
`9`	`7`	`{`
`10`		`- public string Name { get; set; }`
`11`		`- public Employee Manager { get; set; }`
`12`		`- public List<Employee> DirectReports { get; set; }`
	`8`	`+ public string? Name { get; set; }`
	`9`	`+ public Employee? Manager { get; set; }`
	`10`	`+ public List<Employee>? DirectReports { get; set; }`
`13`	`11`	`}`
`14`	`12`
`15`	`13`	`public class Program`
`@@ -38,13 +36,13 @@ public static void Main()`
`38`	`36`	`string tylerJson = JsonSerializer.Serialize(tyler, options);`
`39`	`37`	`Console.WriteLine($"Tyler serialized:\n{tylerJson}");`
`40`	`38`
`41`		`- Employee tylerDeserialized =`
	`39`	`+ Employee? tylerDeserialized =`
`42`	`40`	`JsonSerializer.Deserialize<Employee>(tylerJson, options);`
`43`	`41`
`44`	`42`	`Console.WriteLine(`
`45`	`43`	`"Tyler is manager of Tyler's first direct report: ");`
`46`	`44`	`Console.WriteLine(`
`47`		`- tylerDeserialized.DirectReports[0].Manager == tylerDeserialized);`
	`45`	`+ tylerDeserialized?.DirectReports?[0]?.Manager == tylerDeserialized);`
`48`	`46`	`}`
`49`	`47`	`}`
`50`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,4 @@`
`1`	`1`	`// <All>`
`2`		`-using System;`
`3`		`-using System.IO;`
`4`		`-using System.Text;`
`5`	`2`	`using System.Text.Json;`
`6`	`3`	`using System.Text.Json.Serialization;`
`7`	`4`
`@@ -11,7 +8,7 @@ public class WeatherForecast`
`11`	`8`	`{`
`12`	`9`	`public DateTime Date { get; set; }`
`13`	`10`	`public int TemperatureCelsius { get; set; }`
`14`		`- public string Summary { get; set; }`
	`11`	`+ public string? Summary { get; set; }`
`15`	`12`	`}`
`16`	`13`
`17`	`14`	`// <JsonSourceGenerationOptionsGenmode>`