Add [JsonPropertyName] attributes to Type and PackageUrl

Author: JamieMagee

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

@@ -44,8 +44,10 @@ public CargoComponent(string name, string version, string author = null, string
     public string? Source { get; set; }
 #nullable disable
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Cargo;
 
+    [JsonPropertyName("packageUrl")]
     public override PackageURL PackageUrl => new PackageURL("cargo", string.Empty, this.Name, this.Version, null, string.Empty);
 
     protected override string ComputeId() => $"{this.Name} {this.Version} - {this.Type}";

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

@@ -34,8 +34,10 @@ public ConanComponent(string name, string version, string previous, string packa
     [JsonPropertyName("packageSourceURL")]
     public string PackageSourceURL => $"https://conan.io/center/recipes/{this.Name}?version={this.Version}";
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Conan;
 
+    [JsonPropertyName("packageUrl")]
     public override PackageURL PackageUrl => new PackageURL("conan", string.Empty, this.Name, this.Version, null, string.Empty);
 
     protected override string ComputeId() => $"{this.Name} {this.Version} - {this.Type}";

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

@@ -46,6 +46,7 @@ public CondaComponent()
     [JsonPropertyName("mD5")]
     public string MD5 { get; set; }
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Conda;
 
     protected override string ComputeId() => $"{this.Name} {this.Version} {this.Build} {this.Channel} {this.Subdir} {this.Namespace} {this.Url} {this.MD5} - {this.Type}";

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

@@ -26,6 +26,7 @@ public DockerImageComponent(string hash, string name = null, string tag = null)
     [JsonPropertyName("tag")]
     public string Tag { get; set; }
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.DockerImage;
 
     protected override string ComputeId() => $"{this.Name} {this.Tag} {this.Digest}";

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

@@ -33,6 +33,7 @@ public DockerReferenceComponent()
     [JsonPropertyName("domain")]
     public string Domain { get; set; }
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.DockerReference;
 
     public DockerReference FullReference

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

@@ -43,6 +43,7 @@ public DotNetComponent(string sdkVersion, string targetFramework = null, string
     [JsonPropertyName("projectType")]
     public string ProjectType { get; set; }
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.DotNet;
 
     /// <summary>

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

@@ -29,6 +29,7 @@ public GitComponent()
     [JsonPropertyName("tag")]
     public string Tag { get; set; }
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Git;
 
     protected override string ComputeId() => $"{this.RepositoryUrl} : {this.CommitHash} - {this.Type}";

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

@@ -37,8 +37,10 @@ public GoComponent()
 
     // Commit should be used in place of version when available
     // https://github.com/package-url/purl-spec/blame/180c46d266c45aa2bd81a2038af3f78e87bb4a25/README.rst#L610
+    [JsonPropertyName("packageUrl")]
     public override PackageURL PackageUrl => new PackageURL("golang", null, this.Name, string.IsNullOrWhiteSpace(this.Hash) ? this.Version : this.Hash, null, null);
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Go;
 
     protected override string ComputeId() => $"{this.Name} {this.Version} - {this.Type}";

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

@@ -42,8 +42,10 @@ public LinuxComponent(string distribution, string release, string name, string v
     public string? Author { get; set; }
 #nullable disable
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Linux;
 
+    [JsonPropertyName("packageUrl")]
     public override PackageURL PackageUrl
     {
         get

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

@@ -27,8 +27,10 @@ public MavenComponent()
     [JsonPropertyName("version")]
     public string Version { get; set; }
 
+    [JsonPropertyName("type")]
     public override ComponentType Type => ComponentType.Maven;
 
+    [JsonPropertyName("packageUrl")]
     public override PackageURL PackageUrl => new PackageURL("maven", this.GroupId, this.ArtifactId, this.Version, null, null);
 
     protected override string ComputeId() => $"{this.GroupId} {this.ArtifactId} {this.Version} - {this.Type}";