Merged PR 666068: Update SBOM packages

Update SBOM packages Note this also adjusts to a breaking change in this PR: https://github.com/microsoft/dropvalidator/pull/464
2022-10-18 23:46:38 +00:00 · 2022-10-18 23:46:38 +00:00 · 5dc2855264
--- a/Private/InternalSdk/Microsoft.Parsers.ManifestGenerator/Microsoft.Parsers.ManifestGenerator.dsc
+++ b/Private/InternalSdk/Microsoft.Parsers.ManifestGenerator/Microsoft.Parsers.ManifestGenerator.dsc
@ -17,7 +17,7 @@ namespace Contents {
@@public
 export const pkg: Managed.ManagedNugetPackage =
    Managed.Factory.createNugetPackage(
-        "Microsoft.SBOMApi",
+        "Microsoft.Parsers.ManifestGenerator",
        "0.0.0",
        Contents.all,
        [],
--- a/Private/InternalSdk/Microsoft.Parsers.ManifestGenerator/module.config.dsc
+++ b/Private/InternalSdk/Microsoft.Parsers.ManifestGenerator/module.config.dsc
@ -2,5 +2,5 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

 module({
-    name: "Microsoft.SBOMApi"
-});
+    name: "Microsoft.Parsers.ManifestGenerator"
+});
--- a/Private/InternalSdk/Microsoft.SBOM.Adapters/Microsoft.SBOM.Adapters.dsc
+++ b/Private/InternalSdk/Microsoft.SBOM.Adapters/Microsoft.SBOM.Adapters.dsc
@ -17,7 +17,7 @@ namespace Contents {
@@public
 export const pkg: Managed.ManagedNugetPackage =
    Managed.Factory.createNugetPackage(
-        "Microsoft.SBOM.Adapters",
+        "Microsoft.Sbom.Adapters",
        "0.0.0",
        Contents.all,
        [],
--- a/Private/InternalSdk/Microsoft.SBOM.Adapters/module.config.dsc
+++ b/Private/InternalSdk/Microsoft.SBOM.Adapters/module.config.dsc
@ -2,5 +2,5 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

 module({
-    name: "Microsoft.SBOM.Adapters"
+    name: "Microsoft.Sbom.Adapters"
 });
--- a/Public/Src/Deployment/NugetPackages.dsc
+++ b/Public/Src/Deployment/NugetPackages.dsc
@ -126,8 +126,6 @@ namespace NugetPackages {

            // BuildXL.SBOMUtilities
            ...addIf(BuildXLSdk.Flags.isMicrosoftInternal, 
-                importFrom("BuildXL.Utilities").withQualifier(net472PackageQualifer).SBOMUtilities.dll,
-                importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifer).SBOMUtilities.dll,
                importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifer).SBOMUtilities.dll
            ),

--- a/Public/Src/Tools/DropDaemon/DropDaemon.cs
+++ b/Public/Src/Tools/DropDaemon/DropDaemon.cs
@ -27,6 +27,7 @@ using BuildXL.Utilities.Instrumentation.Common;
 using BuildXL.Utilities.SBOMUtilities;
 using BuildXL.Utilities.Tasks;
 using BuildXL.Utilities.Tracing;
+using Microsoft.ManifestGenerator;
 using Microsoft.Sbom.Adapters;
 using Microsoft.Sbom.Adapters.Report;
 using Microsoft.Sbom.Contracts;
@ -946,7 +947,7 @@ namespace Tool.DropDaemon
                {
                    HashType.SHA1 => AlgorithmName.SHA1,
                    HashType.SHA256 => AlgorithmName.SHA256,
-                    HashType.Vso0 => AlgorithmName.VSO,
+                    HashType.Vso0 => CBHashAlgorithmName.VSO,
                    _ => throw new InvalidOperationException($"Unsupported hash type {hashType} requested in SBOM generation"),
                };
            }
--- a/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
+++ b/Public/Src/Tools/DropDaemon/Tool.DropDaemon.dsc
@ -47,19 +47,16 @@ export namespace DropDaemon {
            importFrom("Microsoft.Azure.Storage.Common").pkg,
            importFrom("Microsoft.Extensions.Logging.Abstractions.v6.0.0").pkg,

-            // We need to reference this even though the codepath which uses the path is never activated 
+            // We need to reference this even though the codepath which uses the path is never activated
            // because of the way that runtime assemblies are loaded into memory.
-            importFrom("Microsoft.VisualStudio.Services.BlobStore.Client.Cache").pkg, 
+            importFrom("Microsoft.VisualStudio.Services.BlobStore.Client.Cache").pkg,
            ...BuildXLSdk.systemThreadingTasksDataflowPackageReference,

            // SBOM related
-            importFrom("Microsoft.SBOMCore").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
-            importFrom("Microsoft.Sbom.Contracts").withQualifier({ targetFramework: "netstandard2.1" }).pkg,
-            ...addIf(
-                BuildXLSdk.isFullFramework,
-                NetFx.Netstandard.dll
-            ),
-            importFrom("Microsoft.SBOM.Adapters").withQualifier({ targetFramework: "netstandard2.0" }).pkg,
+            importFrom("Microsoft.Parsers.ManifestGenerator").pkg,
+            importFrom("Microsoft.SBOMCore").pkg,
+            importFrom("Microsoft.Sbom.Contracts").pkg,
+            importFrom("Microsoft.Sbom.Adapters").pkg,
            importFrom("System.Text.Json.v5.0.0").pkg,
            importFrom("Newtonsoft.Json").pkg,
            importFrom("System.Text.Encodings.Web.v5.0.1").pkg,
@ -77,7 +74,7 @@ export namespace DropDaemon {
            Transformer.sealSourceDirectory({
                root: temporarySdkDropNextToEngineFolder,
                include: "allDirectories",
-            }), 
+            }),
        ],
        untrackedDirectoryScopes: [
            Context.getUserHomeDirectory(),
@ -89,8 +86,8 @@ export namespace DropDaemon {
    };

    @@public
-    export const tool = !BuildXLSdk.isDropToolingEnabled 
-        ? undefined 
+    export const tool = !BuildXLSdk.isDropToolingEnabled
+        ? undefined
        : temporaryDropDaemonTool;
        //: BuildXLSdk.deployManagedTool({
        //    tool: exe,
@ -132,7 +129,7 @@ export namespace DropDaemon {
        return evaluationOnly? evaluationOnlyDeployment : deployment;
    }

-    @@public 
+    @@public
    export function dropDaemonBindingRedirects() {
        return [
            ...BuildXLSdk.cacheBindingRedirects(),
--- a/Public/Src/Utilities/SBOMUtilities/BuildXL.SBOMUtilities.dsc
+++ b/Public/Src/Utilities/SBOMUtilities/BuildXL.SBOMUtilities.dsc
@ -2,6 +2,8 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.

 namespace SBOMUtilities {
+    export declare const qualifier: BuildXLSdk.NetCoreAppQualifier;
+
    @@public
    export const dll = !BuildXLSdk.Flags.isMicrosoftInternal ? undefined : BuildXLSdk.library({
        assemblyName: "BuildXL.Utilities.SBOMUtilities",
--- a/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
+++ b/Public/Src/Utilities/UnitTests/Utilities/Test.BuildXL.Utilities.dsc
@ -4,6 +4,8 @@
 import * as Managed from "Sdk.Managed";

 namespace Core {
+    export declare const qualifier: BuildXLSdk.NetCoreAppQualifier;
+
    @@public
    export const dll = BuildXLSdk.test({
        assemblyName: "Test.BuildXL.Utilities",
@ -16,13 +18,6 @@ namespace Core {
            },
        },
        references: [
-            // This is needed for 'FluentAssersions' running on a full framework.
-            ...addIf(BuildXLSdk.isFullFramework,
-                NetFx.System.Xml.dll,
-                NetFx.System.Xml.Linq.dll,
-                NetFx.System.Runtime.Serialization.dll,
-                NetFx.Netstandard.dll
-            ),
            importFrom("BuildXL.Cache.ContentStore").Hashing.dll,
            importFrom("BuildXL.Utilities").dll,
            importFrom("BuildXL.Utilities").Native.dll,
@ -35,10 +30,6 @@ namespace Core {
            ...BuildXLSdk.systemMemoryDeployment,
            ...addIf(BuildXLSdk.Flags.isMicrosoftInternal, importFrom("BuildXL.Utilities").SBOMUtilities.dll),
            ...addIf(BuildXLSdk.Flags.isMicrosoftInternal, importFrom("Microsoft.Sbom.Contracts").pkg),
-            ...addIf(
-                BuildXLSdk.isFullFramework,
-                BuildXLSdk.withQualifier({targetFramework: qualifier.targetFramework}).NetFx.Netstandard.dll
-            ),
            ...BuildXLSdk.fluentAssertionsWorkaround
        ],
        runtimeContent: [
--- a/cg/nuget/cgmanifest.json
+++ b/cg/nuget/cgmanifest.json
@ -1383,7 +1383,7 @@
        "Type": "NuGet",
        "NuGet": {
          "Name": "Microsoft.ComponentDetection.Contracts",
-          "Version": "1.2.3"
+          "Version": "2.0.2"
        }
      }
    },
@ -1666,15 +1666,6 @@
        }
      }
    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.ManifestInterface",
-          "Version": "2.1.35"
-        }
-      }
-    },
    {
      "Component": {
        "Type": "NuGet",
@ -2058,16 +2049,7 @@
        "Type": "NuGet",
        "NuGet": {
          "Name": "Microsoft.Parsers.ManifestGenerator",
-          "Version": "2.1.35"
-        }
-      }
-    },
-    {
-      "Component": {
-        "Type": "NuGet",
-        "NuGet": {
-          "Name": "Microsoft.Parsers.SPDX22SBOMParser",
-          "Version": "2.1.35"
+          "Version": "2.3.3"
        }
      }
    },
@ -2102,8 +2084,8 @@
      "Component": {
        "Type": "NuGet",
        "NuGet": {
-          "Name": "Microsoft.SBOM.Adapters",
-          "Version": "2.1.35"
+          "Name": "Microsoft.SBOMCore",
+          "Version": "2.3.3"
        }
      }
    },
@ -2111,8 +2093,8 @@
      "Component": {
        "Type": "NuGet",
        "NuGet": {
-          "Name": "Microsoft.SBOMCore",
-          "Version": "2.1.35"
+          "Name": "Microsoft.Sbom.Adapters",
+          "Version": "0.2.6"
        }
      }
    },
@ -2121,7 +2103,25 @@
        "Type": "NuGet",
        "NuGet": {
          "Name": "Microsoft.Sbom.Contracts",
-          "Version": "2.1.35"
+          "Version": "0.2.6"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "Microsoft.Sbom.Extensions",
+          "Version": "0.2.6"
+        }
+      }
+    },
+    {
+      "Component": {
+        "Type": "NuGet",
+        "NuGet": {
+          "Name": "Microsoft.Sbom.Parsers.Spdx22SbomParser",
+          "Version": "0.2.6"
        }
      }
    },
--- a/config.microsoftInternal.dsc
+++ b/config.microsoftInternal.dsc
@ -68,13 +68,13 @@ export const pkgs = isMicrosoftInternal ? [
    { id: "VisualCppTools.Internal.VS2017Layout", version: "14.16.27034", osSkip: [ "macOS", "unix" ] },

    // SBOM Generation
-    { id: "Microsoft.SBOMCore", version: "2.1.35", dependentPackageIdsToSkip: ["Microsoft.Extensions.Logging.Abstractions"] },
-    { id: "Microsoft.Parsers.ManifestGenerator", version: "2.1.35", dependentPackageIdsToSkip: ["Newtonsoft.Json"]},
-    { id: "Microsoft.Parsers.SPDX22SBOMParser", version: "2.1.35" },
-    { id: "Microsoft.SBOM.Adapters", version: "2.1.35", dependentPackageIdsToSkip : ["Newtonsoft.Json", "PackageUrl"] },
-    { id: "Microsoft.ComponentDetection.Contracts", version: "1.2.3", dependentPackageIdsToSkip: ["Newtonsoft.Json"] },
-    { id: "Microsoft.ManifestInterface", version: "2.1.35", dependentPackageIdsToSkip: ["System.Text.Json"] },
-    { id: "Microsoft.Sbom.Contracts", version: "2.1.35" },
+    { id: "Microsoft.SBOMCore", version: "2.3.3" },
+    { id: "Microsoft.Parsers.ManifestGenerator", version: "2.3.3", dependentPackageIdsToIgnore: ["BuildXL.Cache.Hashing"] },
+    { id: "Microsoft.Sbom.Parsers.Spdx22SbomParser", version: "0.2.6" },
+    { id: "Microsoft.Sbom.Adapters", version: "0.2.6" },
+    { id: "Microsoft.ComponentDetection.Contracts", version: "2.0.2" },
+    { id: "Microsoft.Sbom.Contracts", version: "0.2.6" },
+    { id: "Microsoft.Sbom.Extensions", version: "0.2.6" },
    { id: "Microsoft.Bcl.HashCode", version: "1.1.1" },

    // Process remoting