Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update namespaces #41

Merged
merged 1 commit into from
Jul 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Microsoft.Sbom.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Sbom.Contracts;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="CargoComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Sbom.Contracts.Enums;
using System.Collections.Generic;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="CondaComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Sbom.Contracts.Enums;
using System.Collections.Generic;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="DockerImageComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Sbom.Contracts.Enums;
using System.Collections.Generic;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="GitComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Sbom.Contracts.Enums;
using System.Collections.Generic;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="GoComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Sbom.Contracts;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="LinuxComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// A set of static helper methods used by the component detection adapter for logging.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Sbom.Contracts;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="MavenComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using Microsoft.Sbom.Contracts;
using System.Collections.Generic;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="NpmComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Sbom.Contracts;
using System.Linq;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="NuGetComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
using Microsoft.Sbom.Contracts;
using System.Collections.Generic;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="OtherComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Sbom.Contracts;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="PipComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Sbom.Contracts;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="PodComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.ComponentDetection.Contracts.TypedComponent;
using Microsoft.Sbom.Contracts;

namespace Microsoft.Sbom.Adapters.Adapters.ComponentDetection
namespace Microsoft.Sbom.Adapters.ComponentDetection
{
/// <summary>
/// Extensions methods for <see cref="RubyGemsComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// Extensions methods for <see cref="ScannedComponent"/>.
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,10 @@

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Microsoft.SBOM.Adapters</AssemblyName>
<AssemblyName>Microsoft.Sbom.Adapters</AssemblyName>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Description>Provides a set of adapters from external component formats to a single SBOM format.</Description>
<Nullable>enable</Nullable>
<!--NU5104: Warning thrown because Microsoft.VisualStudio.Services.Governance.ComponentDetection.Contracts is a "prerelease" package.-->
<!--Note: due to a bug in dotnet, this needs to be a global nowarn instead of for the specific package it is trying to suppress.-->
<NoWarn>NU5104</NoWarn>
</PropertyGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion src/Microsoft.Sbom.Api/Microsoft.Sbom.Api.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<ProjectReference Include="..\Microsoft.Sbom.Common\Microsoft.Sbom.Common.csproj" />
<ProjectReference Include="..\Microsoft.Sbom.Contracts\Microsoft.Sbom.Contracts.csproj" />
<ProjectReference Include="..\Microsoft.Sbom.Extensions\Microsoft.Sbom.Extensions.csproj" />
<ProjectReference Include="..\Microsoft.Sbom.SPDX22SBOMParser\Microsoft.Sbom.SPDX22SBOMParser.csproj" />
<ProjectReference Include="..\Microsoft.Sbom.Parsers.Spdx22SbomParser\Microsoft.Sbom.Parsers.Spdx22SbomParser.csproj" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Microsoft.Sbom.Extensions.Entities;
using System.Collections.Generic;

namespace Microsoft.SPDX22SBOMParser
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser
{
internal class Constants
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities
{
/// <summary>
/// Represents the hash value of the file using the algorithm specified.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities
{
/// <summary>
/// Used to define creation information about the SBOM.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// Type of the external reference. These are definined in an appendix in the SPDX specification.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities.Enums
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums
{
/// <summary>
/// Defines a Category for an external package reference.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities.Enums
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums
{
/// <summary>
/// This field provides information about the type of file identified.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities.Enums
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities.Enums
{
/// <summary>
/// Defines the type of <see cref="SPDXRelationship"/> between the source and the
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// Defines a reference to an external source of additional information, metadata,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities
{
/// <summary>
/// Used to specify a hash code that describes all the individual
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Collections.Generic;
using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities
{
/// <summary>
/// Represents a SPDX 2.2 Package.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
/// <summary>
/// Defines relationships between elements in the current SBOM.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

using System.Text.Json.Serialization;

namespace Microsoft.SPDX22SBOMParser.Entities
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Entities
{
/// <summary>
/// SPDX 2.2 format External Document reference.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
/// <summary>
/// Generates a SPDX 2.2 format SBOM document.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Microsoft.Parsers.SPDX22SBOMParser</AssemblyName>
<AssemblyName>Microsoft.Sbom.Parsers.Spdx22SbomParser</AssemblyName>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@

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;
using System.Security.Cryptography;
using System.Text;
using HashAlgorithmName = Microsoft.Sbom.Contracts.Enums.AlgorithmName;

namespace Microsoft.SPDX22SBOMParser.Utils
namespace Microsoft.Sbom.Parsers.Spdx22SbomParser.Utils
{
/// <summary>
/// Provides helper functions to generate identity strings for SPDX.
Expand Down
Loading