Complete migration from Newtonsoft.Json to System.Text.Json

src/Microsoft.ComponentDetection.Contracts/BcdeModels/ContainerDetails.cs

@@ -4,12 +4,9 @@ namespace Microsoft.ComponentDetection.Contracts.BcdeModels;
 using System;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 
 // Summary:
 //     Details for a docker container
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class ContainerDetails
 {
     // Summary:

src/Microsoft.ComponentDetection.Contracts/BcdeModels/DefaultGraphScanResult.cs

@@ -2,10 +2,7 @@
 namespace Microsoft.ComponentDetection.Contracts.BcdeModels;
 
 using System.Text.Json.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class DefaultGraphScanResult : ScanResult
 {
     [JsonPropertyName("dependencyGraphs")]

src/Microsoft.ComponentDetection.Contracts/BcdeModels/DependencyGraphWithMetadata.cs

@@ -3,10 +3,7 @@ namespace Microsoft.ComponentDetection.Contracts.BcdeModels;
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Serialization;
 
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class DependencyGraphWithMetadata
 {
     [JsonPropertyName("graph")]

src/Microsoft.ComponentDetection.Contracts/BcdeModels/Detector.cs

@@ -4,11 +4,7 @@ namespace Microsoft.ComponentDetection.Contracts.BcdeModels;
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
 using Microsoft.ComponentDetection.Contracts.TypedComponent;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class Detector
 {
     [JsonPropertyName("detectorId")]
@@ -20,7 +16,6 @@ public class Detector
     [JsonPropertyName("version")]
     public int Version { get; set; }
 
-    [JsonProperty(ItemConverterType = typeof(StringEnumConverter))]
     [JsonPropertyName("supportedComponentTypes")]
     public IEnumerable<ComponentType> SupportedComponentTypes { get; set; }
 }

src/Microsoft.ComponentDetection.Contracts/BcdeModels/ScanResult.cs

@@ -3,11 +3,7 @@ namespace Microsoft.ComponentDetection.Contracts.BcdeModels;
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class ScanResult
 {
     [JsonPropertyName("componentsFound")]
@@ -22,7 +18,7 @@ public class ScanResult
     [JsonPropertyName("containerDetailsMap")]
     public Dictionary<int, ContainerDetails> ContainerDetailsMap { get; set; }
 
-    [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     [JsonPropertyName("resultCode")]
     public ProcessingResultCode ResultCode { get; set; }
 

src/Microsoft.ComponentDetection.Contracts/BcdeModels/ScannedComponent.cs

@@ -3,11 +3,7 @@ namespace Microsoft.ComponentDetection.Contracts.BcdeModels;
 
 using System.Collections.Generic;
 using System.Text.Json.Serialization;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
 public class ScannedComponent
 {
     [JsonPropertyName("locationsFoundAt")]
@@ -22,7 +18,7 @@ public class ScannedComponent
     [JsonPropertyName("isDevelopmentDependency")]
     public bool? IsDevelopmentDependency { get; set; }
 
-    [Newtonsoft.Json.JsonConverter(typeof(StringEnumConverter))]
+    [JsonConverter(typeof(JsonStringEnumConverter))]
     [JsonPropertyName("dependencyScope")]
     public DependencyScope? DependencyScope { get; set; }
 

src/Microsoft.ComponentDetection.Contracts/Microsoft.ComponentDetection.Contracts.csproj

@@ -6,7 +6,6 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Logging" />
-        <PackageReference Include="Newtonsoft.Json" />
         <PackageReference Include="packageurl-dotnet" />
         <PackageReference Include="System.Memory" />
         <PackageReference Include="System.Reactive" />

src/Microsoft.ComponentDetection.Contracts/TypedComponent/TypedComponent.cs

@@ -5,16 +5,8 @@ namespace Microsoft.ComponentDetection.Contracts.TypedComponent;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Text.Json.Serialization;
-using Microsoft.ComponentDetection.Contracts.BcdeModels;
-using Newtonsoft.Json;
-using Newtonsoft.Json.Converters;
-using Newtonsoft.Json.Serialization;
 using PackageUrl;
-using JsonConverterAttribute = Newtonsoft.Json.JsonConverterAttribute;
-using JsonIgnoreAttribute = Newtonsoft.Json.JsonIgnoreAttribute;
 
-[JsonObject(MemberSerialization.OptOut, NamingStrategyType = typeof(CamelCaseNamingStrategy))]
-[JsonConverter(typeof(TypedComponentConverter))]
 [DebuggerDisplay("{DebuggerDisplay,nq}")]
 [JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
 [JsonDerivedType(typeof(CargoComponent), typeDiscriminator: nameof(ComponentType.Cargo))]
@@ -39,8 +31,7 @@ namespace Microsoft.ComponentDetection.Contracts.TypedComponent;
 [JsonDerivedType(typeof(VcpkgComponent), typeDiscriminator: nameof(ComponentType.Vcpkg))]
 public abstract class TypedComponent
 {
-    [JsonIgnore] // Newtonsoft.Json
-    [System.Text.Json.Serialization.JsonIgnore] // System.Text.Json
+    [JsonIgnore]
     private string id;
 
     internal TypedComponent()
@@ -49,21 +40,17 @@ internal TypedComponent()
     }
 
     /// <summary>Gets the type of the component, must be well known.</summary>
-    [JsonConverter(typeof(StringEnumConverter))] // Newtonsoft.Json
-    [JsonProperty("type", Order = int.MinValue)] // Newtonsoft.Json
-    [System.Text.Json.Serialization.JsonIgnore] // System.Text.Json - type is handled by [JsonPolymorphic] discriminator
+    [JsonIgnore] // type is handled by [JsonPolymorphic] discriminator
     public abstract ComponentType Type { get; }
 
     /// <summary>Gets the id of the component.</summary>
-    [JsonProperty("id")] // Newtonsoft.Json
-    [JsonPropertyName("id")] // System.Text.Json
+    [JsonPropertyName("id")]
     public string Id => this.id ??= this.ComputeId();
 
     [JsonPropertyName("packageUrl")]
     public virtual PackageURL PackageUrl { get; }
 
-    [JsonIgnore] // Newtonsoft.Json
-    [System.Text.Json.Serialization.JsonIgnore] // System.Text.Json
+    [JsonIgnore]
     internal string DebuggerDisplay => $"{this.Id}";
 
     protected string ValidateRequiredInput(string input, string fieldName, string componentType)

src/Microsoft.ComponentDetection.Detectors/Microsoft.ComponentDetection.Detectors.csproj

@@ -10,7 +10,6 @@
         <PackageReference Include="SemanticVersioning" />
         <PackageReference Include="yamldotnet" />
         <PackageReference Include="Microsoft.Extensions.Caching.Memory" />
-        <PackageReference Include="Newtonsoft.Json" />
         <PackageReference Include="System.Reactive" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
         <PackageReference Include="Tomlyn.Signed" />

src/Microsoft.ComponentDetection.Orchestrator/Microsoft.ComponentDetection.Orchestrator.csproj

@@ -5,7 +5,6 @@
         <PackageReference Include="DotNet.Glob" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
         <PackageReference Include="Microsoft.Extensions.Logging" />
-        <PackageReference Include="Newtonsoft.Json" />
         <PackageReference Include="Polly" />
         <PackageReference Include="Serilog" />
         <PackageReference Include="Serilog.Sinks.Async" />