Merged PR 669449: Update Microsoft.ComponentDetection.Contracts to 1.2.3

cg/nuget/cgmanifest.json

@@ -1365,7 +1365,7 @@
         "Type": "NuGet",
         "NuGet": {
           "Name": "Microsoft.ComponentDetection.Contracts",
-          "Version": "1.0.8"
+          "Version": "1.2.3"
         }
       }
     },
@@ -2359,15 +2359,6 @@
         }
       }
     },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.VisualStudio.Services.Governance.ComponentDetection.Contracts",
-          "Version": "0.2010.80"
-        }
-      }
-    },
     {
       "Component": {
         "Type": "NuGet",
@@ -4528,6 +4519,15 @@
         }
       }
     },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "packageurl-dotnet",
+          "Version": "1.0.0"
+        }
+      }
+    },
     {
       "Component": {
         "Type": "NuGet",

config.dsc

@@ -425,6 +425,7 @@ config({
                 // Needed for SBOM Generation
                 { id: "Microsoft.Extensions.Logging.Abstractions", version: "6.0.0", alias: "Microsoft.Extensions.Logging.Abstractions.v6.0.0", dependentPackageIdsToSkip: ["System.Buffers", "System.Memory"] },
                 { id: "System.Text.Encodings.Web", version: "5.0.1", dependentPackageIdsToSkip: ["System.Buffers", "System.Memory"], alias: "System.Text.Encodings.Web.v5.0.1" },
+                { id: "packageurl-dotnet", version: "1.0.0" },
                 { id: "PackageUrl", version: "1.0.0" },
                 { id: "System.Reactive", version: "4.4.1" }            
             ],

config.microsoftInternal.dsc

@@ -79,12 +79,11 @@ export const pkgs = isMicrosoftInternal ? [
     { id: "Microsoft.SBOMCore", version: sbomApiVersion, dependentPackageIdsToSkip: ["Microsoft.Extensions.Logging.Abstractions"] },
     { id: "Microsoft.Parsers.ManifestGenerator", version: sbomApiVersion, dependentPackageIdsToSkip: ["Newtonsoft.Json"]},
     { id: "Microsoft.Parsers.SPDX22SBOMParser", version: sbomApiVersion },
-    { id: "Microsoft.SBOM.Adapters", version: sbomApiVersion, dependentPackageIdsToSkip : ["Newtonsoft.Json"] },
-    { id: "Microsoft.ComponentDetection.Contracts", version: "1.0.8", dependentPackageIdsToSkip: ["Newtonsoft.Json"] },
+    { id: "Microsoft.SBOM.Adapters", version: sbomApiVersion, dependentPackageIdsToSkip : ["Newtonsoft.Json", "PackageUrl"] },
+    { id: "Microsoft.ComponentDetection.Contracts", version: "1.2.3", dependentPackageIdsToSkip: ["Newtonsoft.Json"] },
     { id: "Microsoft.ManifestInterface", version: sbomApiVersion, dependentPackageIdsToSkip: ["System.Text.Json"] },
     { id: "Microsoft.Sbom.Contracts", version: sbomApiVersion },
     { id: "Microsoft.Bcl.HashCode", version: "1.1.1" },
-    { id: "Microsoft.VisualStudio.Services.Governance.ComponentDetection.Contracts", version: "0.2010.80" },
 
     // Process remoting
     { id: "AnyBuild.SDK", version: "0.1.14" },