Merge pull request #3 from jpeirson/bugfix/consumer-package-source

Fixed missing dependentFeed/Url properties
Inedo · Jul 26, 2021 · 3620609 · 3620609
2 parents 14cfb7d + 163334e
commit 3620609
Showing 1 changed file with 14 additions and 3 deletions.
diff --git a/pgscan/ProGetClient.cs b/pgscan/ProGetClient.cs
@@ -1,4 +1,5 @@
-using System.IO;
+using System;
+using System.IO;
 using System.Net;
 #if NETCOREAPP3_1
 using System.Text.Json;
@@ -33,12 +34,18 @@ public void RecordPackageDependency(Package package, string feed, PackageConsume
 #if NETCOREAPP3_1
                 using (var writer = new Utf8JsonWriter(requestStream))
                 {
-                    JsonSerializer.Serialize(writer, new DependentPackage(package, feed, consumer));
+                    JsonSerializer.Serialize(writer, new DependentPackage(package, feed, consumer), new JsonSerializerOptions
+                    {
+                        IgnoreNullValues = true
+                    });
                 }
 #else
                 using (var writer = new StreamWriter(requestStream, Encoding.UTF8))
                 {
-                    new JsonSerializer().Serialize(writer, new DependentPackage(package, feed, consumer));
+                    new JsonSerializer
+                    {
+                        NullValueHandling = NullValueHandling.Ignore
+                    }.Serialize(writer, new DependentPackage(package, feed, consumer));
                 }
 #endif
             }
@@ -89,6 +96,10 @@ public DependentPackage(Package p, string feed, PackageConsumer consumer)
             public string DependentPackageGroup => this.c.Group ?? string.Empty;
             [JsonPropertyName("dependentVersion")]
             public string DependentPackageVersion => this.c.Version;
+            [JsonPropertyName("dependentFeed")]
+            public string DependentPackageFeed => this.c.Feed;
+            [JsonPropertyName("dependentUrl")]
+            public object DependentPackageUrl => this.c.Url;
         }
     }
 }