Add Microsoft.Sbom.Common (#6)

* Add Microsoft.Sbom.Common Update Microsoft.Sbom.Extensions with latest from internal repo * Add copyright * Fix StyleCop errors * Add Adapters * Fix StyleCop issues * Add SPDX22SBOMParser * Add copyright headers * StyleCop fix Co-authored-by: Kevin Sigmund <ksigmund@microsoft.com> Co-authored-by: Aasim Malladi <aamallad@microsoft.com>
microsoft · Jun 22, 2022 · db698cc · db698cc
1 parent 95be22a
commit db698cc
Show file tree

Hide file tree

Showing 128 changed files with 4,858 additions and 628 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,18 +1,18 @@
 <!-- All csproj package references should not include version numbers. The version numbers are set using this props file. -->
 <Project>
     <ItemDefinitionGroup>
-        <PackageReference>
+        <PackageVersion>
             <!-- Do not share compile-time dependencies transitively.  This requires that all projects reference all packages -->
             <PrivateAssets>Compile</PrivateAssets>
-        </PackageReference>
+        </PackageVersion>
     </ItemDefinitionGroup>
 
     <ItemGroup>
         <PackageVersion Include="MinVer" Version="2.5.0"/>
         <PackageVersion Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.3.0"/>
         <PackageVersion Include="Newtonsoft.Json" Version="13.0.1"/>
         <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118"/>
-        <PackageVersion Include="System.Text.Json" Version="5.0.2" />  
+        <PackageVersion Include="System.Text.Json" Version="6.0.5" />
         <PackageVersion Include="System.Composition.AttributedModel" Version="1.4.1"/>
         <PackageVersion Include="System.Composition.Convention" Version="1.4.1"/>
         <PackageVersion Include="System.Composition.Hosting" Version="1.4.1"/>
@@ -22,5 +22,28 @@
         <PackageVersion Include="System.Reactive" Version="5.0.0"/>
         <PackageVersion Include="System.Runtime.Loader" Version="4.3.0"/>
         <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="4.9.0"/>
+        <PackageVersion Include="Serilog.Sinks.Console" Version="4.0.0" />
+        <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+        <PackageVersion Include="Mono.Posix.NETStandard" Version="1.0.0" />
+        <!-- <PackageVersion Include="Microsoft.ComponentDetection" Version="1.1.7" /> -->
+        <PackageVersion Include="Microsoft.ComponentDetection.Contracts" Version="1.1.7" />
+        <PackageVersion Include="Microsoft.ComponentDetection.Common" Version="1.1.7" />
+        <PackageVersion Include="Microsoft.ComponentDetection.Orchestrator" Version="1.1.7" />
+        <PackageVersion Include="Microsoft.ComponentDetection.Detectors" Version="1.1.7" />
+        <PackageVersion Include="packageurl-dotnet" Version="1.1.0" />
+        <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="16.10.0" />
+        <PackageVersion Include="MSTest.TestFramework" Version="2.2.5" />
+        <PackageVersion Include="MSTest.TestAdapter" Version="2.2.5" />
+        <PackageVersion Include="coverlet.collector" Version="3.1.0" />
+        <PackageVersion Include="Moq" Version="4.17.2" />
+        <PackageVersion Include="AutoMapper" Version="10.1.1" />
+        <PackageVersion Include="Ninject" Version="3.3.4" />
+        <PackageVersion Include="Ninject.Extensions.Conventions" Version="3.3.0" />
+        <PackageVersion Include="PowerArgs" Version="3.6.0" />
+        <PackageVersion Include="Serilog.Sinks.Console" Version="4.0.0" />
+        <PackageVersion Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
+        <PackageVersion Include="System.Threading.Channels" Version="6.0.0" />
+        <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
+        <!-- <PackageVersion include="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" /> -->
     </ItemGroup>
 </Project>
diff --git a/Microsoft.Sbom.sln b/Microsoft.Sbom.sln
@@ -4,11 +4,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 VisualStudioVersion = 17.2.32505.173
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Extensions", "src\Microsoft.Sbom.Extensions\Microsoft.Sbom.Extensions.csproj", "{256D50F7-5B0E-4394-81E0-DCEE32F96634}"
-	ProjectSection(ProjectDependencies) = postProject
-		{9142A120-B118-4B9E-8B6C-C6C97C9A33F7} = {9142A120-B118-4B9E-8B6C-C6C97C9A33F7}
-	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Api.Contracts", "src\Microsoft.Sbom.Api.Contracts\Microsoft.Sbom.Api.Contracts.csproj", "{9142A120-B118-4B9E-8B6C-C6C97C9A33F7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Common", "src\Microsoft.Sbom.Common\Microsoft.Sbom.Common.csproj", "{07A58335-CBFF-4A50-9B25-066A1F223894}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Adapters", "src\Microsoft.Sbom.Adapters\Microsoft.Sbom.Adapters.csproj", "{67C5E2DF-E56F-4627-975D-534C50E904C5}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B4BFDF6F-4AFB-40AB-B2CE-3027FE04DBCD}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.Sbom.Contracts", "src\Microsoft.Sbom.Contracts\Microsoft.Sbom.Contracts.csproj", "{AA73B697-C992-4940-8375-17B9B77AB351}"
+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}"
+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}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -20,10 +29,30 @@ Global
 		{256D50F7-5B0E-4394-81E0-DCEE32F96634}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{256D50F7-5B0E-4394-81E0-DCEE32F96634}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{256D50F7-5B0E-4394-81E0-DCEE32F96634}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9142A120-B118-4B9E-8B6C-C6C97C9A33F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9142A120-B118-4B9E-8B6C-C6C97C9A33F7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9142A120-B118-4B9E-8B6C-C6C97C9A33F7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9142A120-B118-4B9E-8B6C-C6C97C9A33F7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{07A58335-CBFF-4A50-9B25-066A1F223894}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{07A58335-CBFF-4A50-9B25-066A1F223894}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{07A58335-CBFF-4A50-9B25-066A1F223894}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{07A58335-CBFF-4A50-9B25-066A1F223894}.Release|Any CPU.Build.0 = Release|Any CPU
+		{67C5E2DF-E56F-4627-975D-534C50E904C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{67C5E2DF-E56F-4627-975D-534C50E904C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{67C5E2DF-E56F-4627-975D-534C50E904C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{67C5E2DF-E56F-4627-975D-534C50E904C5}.Release|Any CPU.Build.0 = Release|Any CPU
+		{AA73B697-C992-4940-8375-17B9B77AB351}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{AA73B697-C992-4940-8375-17B9B77AB351}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{AA73B697-C992-4940-8375-17B9B77AB351}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{AA73B697-C992-4940-8375-17B9B77AB351}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4F5EA400-F98B-4010-A8E1-D55A96428B07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4F5EA400-F98B-4010-A8E1-D55A96428B07}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4F5EA400-F98B-4010-A8E1-D55A96428B07}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4F5EA400-F98B-4010-A8E1-D55A96428B07}.Release|Any CPU.Build.0 = Release|Any CPU
+		{86EC977D-A785-40FF-AE78-C1EC4254AFF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{86EC977D-A785-40FF-AE78-C1EC4254AFF8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{86EC977D-A785-40FF-AE78-C1EC4254AFF8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{86EC977D-A785-40FF-AE78-C1EC4254AFF8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{ADDEE422-40D1-48D9-A5FB-BBE990272B78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{ADDEE422-40D1-48D9-A5FB-BBE990272B78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{ADDEE422-40D1-48D9-A5FB-BBE990272B78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{ADDEE422-40D1-48D9-A5FB-BBE990272B78}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE