From 85d148fccb31dd147ee7ec52ea6bafc1fa2f420f Mon Sep 17 00:00:00 2001 From: Anton Kovalyov Date: Mon, 11 Jul 2022 16:29:26 -0700 Subject: [PATCH] Namespace and folder updates. --- Microsoft.Sbom.sln | 4 ++-- .../ComponentDetection/CargoComponentExtensions.cs | 2 +- .../ComponentDetection/CondaComponentExtensions.cs | 2 +- .../DockerImageComponentExtensions.cs | 2 +- .../ComponentDetection/GitComponentExtensions.cs | 2 +- .../ComponentDetection/GoComponentExtensions.cs | 2 +- .../ComponentDetection/LinuxComponentExtensions.cs | 2 +- .../ComponentDetection/Logging/LoggingHelper.cs | 2 +- .../ComponentDetection/MavenComponentExtensions.cs | 2 +- .../ComponentDetection/NpmComponentExtensions.cs | 2 +- .../ComponentDetection/NuGetComponentExtensions.cs | 2 +- .../ComponentDetection/OtherComponentExtensions.cs | 2 +- .../ComponentDetection/PipComponentExtensions.cs | 2 +- .../ComponentDetection/PodComponentExtensions.cs | 2 +- .../ComponentDetection/RubyGemsComponentExtensions.cs | 2 +- .../ComponentDetection/ScannedComponentExtensions.cs | 4 ++-- .../ComponentDetectionToSBOMPackageAdapter.cs | 2 +- .../Microsoft.Sbom.Adapters.csproj | 5 +---- .../Executors/ComponentToPackageInfoConverter.cs | 2 +- src/Microsoft.Sbom.Api/Microsoft.Sbom.Api.csproj | 2 +- .../Constants.cs | 2 +- .../Entities/Checksum.cs | 2 +- .../Entities/CreationInfo.cs | 2 +- .../Entities/Creator.cs | 2 +- .../Entities/Enums/ExternalRepositoryType.cs | 2 +- .../Entities/Enums/ReferenceCategory.cs | 2 +- .../Entities/Enums/SPDXFileType.cs | 2 +- .../Entities/Enums/SPDXRelationshipType.cs | 2 +- .../Entities/ExternalReference.cs | 4 ++-- .../Entities/PackageVerificationCode.cs | 2 +- .../Entities/SPDX22Document.cs | 2 +- .../Entities/SPDXPackage.cs | 2 +- .../Entities/SPDXRelationship.cs | 4 ++-- .../Entities/SpdxExternalDocumentReference.cs | 2 +- .../Entities/SpdxFile.cs | 4 ++-- .../Exceptions/MissingHashValueException.cs | 2 +- .../Generator.cs | 10 +++++----- .../Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj} | 2 +- .../Utils/IdentityUtils.cs | 4 ++-- .../Utils/SPDXExtensions.cs | 6 +++--- .../Validator.cs | 2 +- .../ComponentDetectionToSBOMPackageAdapterTests.cs | 4 ++-- ...crosoft.Sbom.Parsers.Spdx22SbomParser.Tests.csproj} | 4 ++-- .../Utils/IdentityUtilsTests.cs | 2 +- .../Utils/SPDXExtensionsTest.cs | 6 +++--- 45 files changed, 61 insertions(+), 64 deletions(-) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Constants.cs (98%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/Checksum.cs (92%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/CreationInfo.cs (93%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/Creator.cs (80%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/Enums/ExternalRepositoryType.cs (94%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/Enums/ReferenceCategory.cs (87%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/Enums/SPDXFileType.cs (90%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/Enums/SPDXRelationshipType.cs (95%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/ExternalReference.cs (92%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/PackageVerificationCode.cs (94%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/SPDX22Document.cs (97%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/SPDXPackage.cs (98%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/SPDXRelationship.cs (90%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/SpdxExternalDocumentReference.cs (94%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Entities/SpdxFile.cs (94%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Exceptions/MissingHashValueException.cs (92%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Generator.cs (98%) rename src/{Microsoft.Sbom.SPDX22SBOMParser/Microsoft.Sbom.SPDX22SBOMParser.csproj => Microsoft.Sbom.Parsers.Spdx22SbomParser/Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj} (85%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Utils/IdentityUtils.cs (98%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Utils/SPDXExtensions.cs (97%) rename src/{Microsoft.Sbom.SPDX22SBOMParser => Microsoft.Sbom.Parsers.Spdx22SbomParser}/Validator.cs (94%) rename test/{Microsoft.Sbom.SPDX22SBOMParser.Tests/Microsoft.Sbom.SPDX22SBOMParser.Tests.csproj => Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests.csproj} (77%) rename test/{Microsoft.Sbom.SPDX22SBOMParser.Tests => Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests}/Utils/IdentityUtilsTests.cs (96%) rename test/{Microsoft.Sbom.SPDX22SBOMParser.Tests => Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests}/Utils/SPDXExtensionsTest.cs (96%) diff --git a/Microsoft.Sbom.sln b/Microsoft.Sbom.sln index ec687835..1d7c2185 100644 --- a/Microsoft.Sbom.sln +++ b/Microsoft.Sbom.sln @@ -15,9 +15,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Contracts", EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Adapters.Tests", "test\Microsoft.Sbom.Adapters.Tests\Microsoft.Sbom.Adapters.Tests.csproj", "{4F5EA400-F98B-4010-A8E1-D55A96428B07}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.SPDX22SBOMParser", "src\Microsoft.Sbom.SPDX22SBOMParser\Microsoft.Sbom.SPDX22SBOMParser.csproj", "{86EC977D-A785-40FF-AE78-C1EC4254AFF8}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Parsers.Spdx22SbomParser", "src\Microsoft.Sbom.Parsers.Spdx22SbomParser\Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj", "{86EC977D-A785-40FF-AE78-C1EC4254AFF8}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.SPDX22SBOMParser.Tests", "test\Microsoft.Sbom.SPDX22SBOMParser.Tests\Microsoft.Sbom.SPDX22SBOMParser.Tests.csproj", "{ADDEE422-40D1-48D9-A5FB-BBE990272B78}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests", "test\Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests\Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests.csproj", "{ADDEE422-40D1-48D9-A5FB-BBE990272B78}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Api", "src\Microsoft.Sbom.Api\Microsoft.Sbom.Api.csproj", "{725723C5-DCA4-4BAD-8883-CC94E5F5A5A8}" EndProject diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CargoComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CargoComponentExtensions.cs index 96459dd3..8a1be2f3 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CargoComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CargoComponentExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CondaComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CondaComponentExtensions.cs index 03560605..b0be141e 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CondaComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/CondaComponentExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Sbom.Contracts.Enums; using System.Collections.Generic; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/DockerImageComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/DockerImageComponentExtensions.cs index 57c55f2f..795d7c49 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/DockerImageComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/DockerImageComponentExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Sbom.Contracts.Enums; using System.Collections.Generic; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GitComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GitComponentExtensions.cs index 0b978a84..4fb39d68 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GitComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GitComponentExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Sbom.Contracts.Enums; using System.Collections.Generic; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GoComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GoComponentExtensions.cs index a74362c9..aacc4f6d 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GoComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/GoComponentExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Sbom.Contracts.Enums; using System.Collections.Generic; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/LinuxComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/LinuxComponentExtensions.cs index adf03864..f37ffd28 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/LinuxComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/LinuxComponentExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/Logging/LoggingHelper.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/Logging/LoggingHelper.cs index 978217c9..998e8126 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/Logging/LoggingHelper.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/Logging/LoggingHelper.cs @@ -5,7 +5,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Adapters.Report; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection.Logging +namespace Microsoft.Sbom.Adapters.ComponentDetection.Logging { /// /// A set of static helper methods used by the component detection adapter for logging. diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/MavenComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/MavenComponentExtensions.cs index d7b5b164..47c473b8 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/MavenComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/MavenComponentExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NpmComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NpmComponentExtensions.cs index 2d55342b..2e89db41 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NpmComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NpmComponentExtensions.cs @@ -6,7 +6,7 @@ using Microsoft.Sbom.Contracts; using System.Collections.Generic; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NuGetComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NuGetComponentExtensions.cs index b0f45d96..6e48b7b3 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NuGetComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/NuGetComponentExtensions.cs @@ -5,7 +5,7 @@ using Microsoft.Sbom.Contracts; using System.Linq; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/OtherComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/OtherComponentExtensions.cs index b2c51e9c..f30d6589 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/OtherComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/OtherComponentExtensions.cs @@ -5,7 +5,7 @@ using Microsoft.Sbom.Contracts; using System.Collections.Generic; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PipComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PipComponentExtensions.cs index 542d7fa0..bd18de19 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PipComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PipComponentExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PodComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PodComponentExtensions.cs index 826f2dd1..0f5c096b 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PodComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/PodComponentExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/RubyGemsComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/RubyGemsComponentExtensions.cs index 9549f098..6ab25543 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/RubyGemsComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/RubyGemsComponentExtensions.cs @@ -4,7 +4,7 @@ using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/ScannedComponentExtensions.cs b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/ScannedComponentExtensions.cs index bd1490bb..24c837e1 100644 --- a/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/ScannedComponentExtensions.cs +++ b/src/Microsoft.Sbom.Adapters/Adapters/ComponentDetection/ScannedComponentExtensions.cs @@ -5,10 +5,10 @@ using Microsoft.Sbom.Adapters.Report; using Microsoft.ComponentDetection.Contracts.TypedComponent; using Microsoft.Sbom.Contracts; -using Microsoft.Sbom.Adapters.Adapters.ComponentDetection.Logging; +using Microsoft.Sbom.Adapters.ComponentDetection.Logging; using Microsoft.ComponentDetection.Contracts.BcdeModels; -namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection +namespace Microsoft.Sbom.Adapters.ComponentDetection { /// /// Extensions methods for . diff --git a/src/Microsoft.Sbom.Adapters/ComponentDetectionToSBOMPackageAdapter.cs b/src/Microsoft.Sbom.Adapters/ComponentDetectionToSBOMPackageAdapter.cs index 233854d5..c740ce76 100644 --- a/src/Microsoft.Sbom.Adapters/ComponentDetectionToSBOMPackageAdapter.cs +++ b/src/Microsoft.Sbom.Adapters/ComponentDetectionToSBOMPackageAdapter.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.Sbom.Adapters.Adapters.ComponentDetection; +using Microsoft.Sbom.Adapters.ComponentDetection; using Microsoft.Sbom.Adapters.Report; using Newtonsoft.Json; using System.Collections.Generic; diff --git a/src/Microsoft.Sbom.Adapters/Microsoft.Sbom.Adapters.csproj b/src/Microsoft.Sbom.Adapters/Microsoft.Sbom.Adapters.csproj index 3ea270e5..975d32bf 100644 --- a/src/Microsoft.Sbom.Adapters/Microsoft.Sbom.Adapters.csproj +++ b/src/Microsoft.Sbom.Adapters/Microsoft.Sbom.Adapters.csproj @@ -2,13 +2,10 @@ netstandard2.1 - Microsoft.SBOM.Adapters + Microsoft.Sbom.Adapters True Provides a set of adapters from external component formats to a single SBOM format. enable - - - NU5104 diff --git a/src/Microsoft.Sbom.Api/Executors/ComponentToPackageInfoConverter.cs b/src/Microsoft.Sbom.Api/Executors/ComponentToPackageInfoConverter.cs index a7c5a807..9b6b8977 100644 --- a/src/Microsoft.Sbom.Api/Executors/ComponentToPackageInfoConverter.cs +++ b/src/Microsoft.Sbom.Api/Executors/ComponentToPackageInfoConverter.cs @@ -2,7 +2,7 @@ // Licensed under the MIT license. See LICENSE file in the project root for full license information. using Microsoft.ComponentDetection.Contracts.BcdeModels; -using Microsoft.Sbom.Adapters.Adapters.ComponentDetection; +using Microsoft.Sbom.Adapters.ComponentDetection; using Microsoft.Sbom.Adapters.Report; using Microsoft.Sbom.Api.Entities; using Microsoft.Sbom.Contracts; diff --git a/src/Microsoft.Sbom.Api/Microsoft.Sbom.Api.csproj b/src/Microsoft.Sbom.Api/Microsoft.Sbom.Api.csproj index f001e1d1..039ce216 100644 --- a/src/Microsoft.Sbom.Api/Microsoft.Sbom.Api.csproj +++ b/src/Microsoft.Sbom.Api/Microsoft.Sbom.Api.csproj @@ -41,7 +41,7 @@ - + \ No newline at end of file diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Constants.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Constants.cs similarity index 98% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Constants.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Constants.cs index f204f42c..6290e3e6 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Constants.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Constants.cs @@ -4,7 +4,7 @@ using Microsoft.Sbom.Extensions.Entities; using System.Collections.Generic; -namespace Microsoft.SPDX22SBOMParser +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser { internal class Constants { diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Checksum.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Checksum.cs similarity index 92% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Checksum.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Checksum.cs index bf291a3f..2dd48247 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Checksum.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Checksum.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// Represents the hash value of the file using the algorithm specified. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/CreationInfo.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/CreationInfo.cs similarity index 93% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/CreationInfo.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/CreationInfo.cs index 297e2447..7eebc8bc 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/CreationInfo.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/CreationInfo.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// Used to define creation information about the SBOM. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Creator.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Creator.cs similarity index 80% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Creator.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Creator.cs index 372b2949..7975a756 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Creator.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Creator.cs @@ -1,7 +1,7 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { internal class Creator { diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/ExternalRepositoryType.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ExternalRepositoryType.cs similarity index 94% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/ExternalRepositoryType.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ExternalRepositoryType.cs index 2c668804..18b080ba 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/ExternalRepositoryType.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ExternalRepositoryType.cs @@ -4,7 +4,7 @@ using System.Diagnostics.CodeAnalysis; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities.Enums +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums { /// /// Type of the external reference. These are definined in an appendix in the SPDX specification. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/ReferenceCategory.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ReferenceCategory.cs similarity index 87% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/ReferenceCategory.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ReferenceCategory.cs index edd2d288..aaa78a00 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/ReferenceCategory.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/ReferenceCategory.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities.Enums +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums { /// /// Defines a Category for an external package reference. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/SPDXFileType.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/SPDXFileType.cs similarity index 90% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/SPDXFileType.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/SPDXFileType.cs index 63d2c98a..8fadfcb3 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/SPDXFileType.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/SPDXFileType.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities.Enums +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums { /// /// This field provides information about the type of file identified. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/SPDXRelationshipType.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/SPDXRelationshipType.cs similarity index 95% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/SPDXRelationshipType.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/SPDXRelationshipType.cs index c20b1a54..f33eb8b7 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/Enums/SPDXRelationshipType.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/Enums/SPDXRelationshipType.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities.Enums +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums { /// /// Defines the type of between the source and the diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/ExternalReference.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/ExternalReference.cs similarity index 92% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/ExternalReference.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/ExternalReference.cs index c40cc625..dd6abc8c 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/ExternalReference.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/ExternalReference.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.SPDX22SBOMParser.Entities.Enums; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// Defines a reference to an external source of additional information, metadata, diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/PackageVerificationCode.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/PackageVerificationCode.cs similarity index 94% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/PackageVerificationCode.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/PackageVerificationCode.cs index c1515ec0..b5fcc1b5 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/PackageVerificationCode.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/PackageVerificationCode.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// Used to specify a hash code that describes all the individual diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDX22Document.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDX22Document.cs similarity index 97% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDX22Document.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDX22Document.cs index e610a43a..b1c9d401 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDX22Document.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDX22Document.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { internal class SPDX22Document { diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDXPackage.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDXPackage.cs similarity index 98% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDXPackage.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDXPackage.cs index 05dce6b1..02afd345 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDXPackage.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDXPackage.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// Represents a SPDX 2.2 Package. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDXRelationship.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDXRelationship.cs similarity index 90% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDXRelationship.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDXRelationship.cs index b10ad1d4..2f82fbb2 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SPDXRelationship.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SPDXRelationship.cs @@ -1,10 +1,10 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.SPDX22SBOMParser.Entities.Enums; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// Defines relationships between elements in the current SBOM. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SpdxExternalDocumentReference.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SpdxExternalDocumentReference.cs similarity index 94% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SpdxExternalDocumentReference.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SpdxExternalDocumentReference.cs index e606b456..52b734b2 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SpdxExternalDocumentReference.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SpdxExternalDocumentReference.cs @@ -3,7 +3,7 @@ using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { /// /// SPDX 2.2 format External Document reference. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SpdxFile.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SpdxFile.cs similarity index 94% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SpdxFile.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SpdxFile.cs index a14c4b36..2c94bfa8 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Entities/SpdxFile.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Entities/SpdxFile.cs @@ -1,11 +1,11 @@ // Copyright (c) Microsoft. All rights reserved. // Licensed under the MIT license. See LICENSE file in the project root for full license information. -using Microsoft.SPDX22SBOMParser.Entities.Enums; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums; using System.Collections.Generic; using System.Text.Json.Serialization; -namespace Microsoft.SPDX22SBOMParser.Entities +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities { public class SPDXFile { diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Exceptions/MissingHashValueException.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Exceptions/MissingHashValueException.cs similarity index 92% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Exceptions/MissingHashValueException.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Exceptions/MissingHashValueException.cs index 30aea564..9381cbfb 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Exceptions/MissingHashValueException.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Exceptions/MissingHashValueException.cs @@ -4,7 +4,7 @@ using System; using System.Runtime.Serialization; -namespace Microsoft.SPDX22SBOMParser.Exceptions +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Exceptions { [Serializable] internal class MissingHashValueException : Exception diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Generator.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Generator.cs similarity index 98% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Generator.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Generator.cs index 2be3ab6c..e45d26c6 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Generator.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Generator.cs @@ -5,16 +5,16 @@ using Microsoft.Sbom.Extensions.Entities; using Microsoft.Sbom.Contracts; using Microsoft.Sbom.Contracts.Enums; -using Microsoft.SPDX22SBOMParser.Entities; -using Microsoft.SPDX22SBOMParser.Entities.Enums; -using Microsoft.SPDX22SBOMParser.Exceptions; -using Microsoft.SPDX22SBOMParser.Utils; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Exceptions; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Utils; using System; using System.Collections.Generic; using System.Linq; using System.Text.Json; -namespace Microsoft.SPDX22SBOMParser +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser { /// /// Generates a SPDX 2.2 format SBOM document. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Microsoft.Sbom.SPDX22SBOMParser.csproj b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj similarity index 85% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Microsoft.Sbom.SPDX22SBOMParser.csproj rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj index 407d692a..6bd4f250 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Microsoft.Sbom.SPDX22SBOMParser.csproj +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj @@ -2,7 +2,7 @@ netstandard2.1 - Microsoft.Parsers.SPDX22SBOMParser + Microsoft.Sbom.Parsers.Spdx22SbomParser True diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Utils/IdentityUtils.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Utils/IdentityUtils.cs similarity index 98% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Utils/IdentityUtils.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Utils/IdentityUtils.cs index 4f7a2e7c..e19d0158 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Utils/IdentityUtils.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Utils/IdentityUtils.cs @@ -3,7 +3,7 @@ using Microsoft.Sbom.Extensions; using Microsoft.Sbom.Extensions.Entities; -using Microsoft.SPDX22SBOMParser.Entities; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities; using System; using System.Collections.Generic; using System.Linq; @@ -11,7 +11,7 @@ using System.Text; using HashAlgorithmName = Microsoft.Sbom.Contracts.Enums.AlgorithmName; -namespace Microsoft.SPDX22SBOMParser.Utils +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Utils { /// /// Provides helper functions to generate identity strings for SPDX. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Utils/SPDXExtensions.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Utils/SPDXExtensions.cs similarity index 97% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Utils/SPDXExtensions.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Utils/SPDXExtensions.cs index 1bdefb3f..b1f53fc0 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Utils/SPDXExtensions.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Utils/SPDXExtensions.cs @@ -4,8 +4,8 @@ using Microsoft.Sbom.Extensions.Exceptions; using Microsoft.Sbom.Contracts; using Microsoft.Sbom.Contracts.Enums; -using Microsoft.SPDX22SBOMParser.Entities; -using Microsoft.SPDX22SBOMParser.Entities.Enums; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums; using System; using System.Collections.Generic; using System.Linq; @@ -13,7 +13,7 @@ using System.Text; using System.Text.RegularExpressions; -namespace Microsoft.SPDX22SBOMParser.Utils +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Utils { /// /// Provides extensions to SPDX objects. diff --git a/src/Microsoft.Sbom.SPDX22SBOMParser/Validator.cs b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Validator.cs similarity index 94% rename from src/Microsoft.Sbom.SPDX22SBOMParser/Validator.cs rename to src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Validator.cs index b8637faa..142d96cb 100644 --- a/src/Microsoft.Sbom.SPDX22SBOMParser/Validator.cs +++ b/src/Microsoft.Sbom.Parsers.Spdx22SbomParser/Validator.cs @@ -5,7 +5,7 @@ using Microsoft.Sbom.Extensions.Entities; using System; -namespace Microsoft.SPDX22SBOMParser +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser { /// /// Validates files in a folder against their checksums stored in an SPDX 2.2 SBOM. diff --git a/test/Microsoft.Sbom.Adapters.Tests/ComponentDetectionToSBOMPackageAdapterTests.cs b/test/Microsoft.Sbom.Adapters.Tests/ComponentDetectionToSBOMPackageAdapterTests.cs index 284297fe..ee17bb97 100644 --- a/test/Microsoft.Sbom.Adapters.Tests/ComponentDetectionToSBOMPackageAdapterTests.cs +++ b/test/Microsoft.Sbom.Adapters.Tests/ComponentDetectionToSBOMPackageAdapterTests.cs @@ -9,12 +9,12 @@ using Microsoft.Sbom.Adapters.Report; using Microsoft.Sbom.Contracts; using Microsoft.ComponentDetection.Contracts.TypedComponent; -using Microsoft.Sbom.Adapters.Adapters.ComponentDetection; +using Microsoft.Sbom.Adapters.ComponentDetection; using Microsoft.ComponentDetection.Contracts.BcdeModels; using Microsoft.Sbom.Contracts.Enums; using Microsoft.ComponentDetection.Contracts.Internal; -namespace Microsoft.Sbom.Adapters.Adapters.Tests +namespace Microsoft.Sbom.Adapters.Tests { [TestClass] public class ComponentDetectionToSBOMPackageAdapterTests diff --git a/test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Microsoft.Sbom.SPDX22SBOMParser.Tests.csproj b/test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests.csproj similarity index 77% rename from test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Microsoft.Sbom.SPDX22SBOMParser.Tests.csproj rename to test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests.csproj index f8e22e13..f40b25ab 100644 --- a/test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Microsoft.Sbom.SPDX22SBOMParser.Tests.csproj +++ b/test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -18,7 +18,7 @@ - + diff --git a/test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Utils/IdentityUtilsTests.cs b/test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Utils/IdentityUtilsTests.cs similarity index 96% rename from test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Utils/IdentityUtilsTests.cs rename to test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Utils/IdentityUtilsTests.cs index 16fec072..bd8b757a 100644 --- a/test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Utils/IdentityUtilsTests.cs +++ b/test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Utils/IdentityUtilsTests.cs @@ -7,7 +7,7 @@ using Moq; using System.ComponentModel; -namespace Microsoft.SPDX22SBOMParser.Utils.Tests +namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Utils.Tests { [TestClass] public class IdentityUtilsTests diff --git a/test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Utils/SPDXExtensionsTest.cs b/test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Utils/SPDXExtensionsTest.cs similarity index 96% rename from test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Utils/SPDXExtensionsTest.cs rename to test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Utils/SPDXExtensionsTest.cs index 2f9b4cea..b28644b7 100644 --- a/test/Microsoft.Sbom.SPDX22SBOMParser.Tests/Utils/SPDXExtensionsTest.cs +++ b/test/Microsoft.Sbom.Parsers.Spdx22SbomParser.Tests/Utils/SPDXExtensionsTest.cs @@ -3,9 +3,9 @@ using Microsoft.Sbom.Contracts; using Microsoft.Sbom.Contracts.Enums; -using Microsoft.SPDX22SBOMParser.Entities; -using Microsoft.SPDX22SBOMParser.Entities.Enums; -using Microsoft.SPDX22SBOMParser.Utils; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums; +using Microsoft.Sbom.Parsers.Spdx22SbomParser.Utils; using Microsoft.VisualStudio.TestTools.UnitTesting; using System; using System.Collections.Generic;