Merge branch 'main' into jupinzer/docker_compose_detector

Author: jpinz

Directory.Packages.props

@@ -6,7 +6,6 @@
     </PackageReference>
   </ItemDefinitionGroup>
   <ItemGroup>
-    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
     <PackageVersion Include="Docker.DotNet" Version="3.125.15" />
     <PackageVersion Include="AwesomeAssertions" Version="9.4.0" />
     <PackageVersion Include="AwesomeAssertions.Analyzers" Version="9.0.8" />
@@ -44,7 +43,6 @@
     <PackageVersion Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
     <PackageVersion Include="System.Memory" Version="4.6.3" />
     <PackageVersion Include="System.Reactive" Version="6.1.0" />
-    <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
     <PackageVersion Include="System.Text.Json" Version="9.0.13" />
     <PackageVersion Include="System.Threading.Tasks.Dataflow" Version="8.0.1" />
     <PackageVersion Include="Tomlyn.Signed" Version="0.20.0" />

src/Microsoft.ComponentDetection.Common/Microsoft.ComponentDetection.Common.csproj

@@ -21,16 +21,4 @@
         <ProjectReference Include="..\Microsoft.ComponentDetection.Contracts\Microsoft.ComponentDetection.Contracts.csproj" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Update="Resources.Designer.cs">
-            <DependentUpon>Resources.resx</DependentUpon>
-            <DesignTime>True</DesignTime>
-            <AutoGen>True</AutoGen>
-        </Compile>
-        <EmbeddedResource Update="Resources.resx">
-            <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-            <Generator>ResXFileCodeGenerator</Generator>
-        </EmbeddedResource>
-    </ItemGroup>
-
 </Project>

src/Microsoft.ComponentDetection.Common/Resources.Designer.cs

@@ -0,0 +1,8 @@
+namespace Microsoft.ComponentDetection.Common;
+
+internal static class Resources
+{
+    internal const string MissingComponentId = "The component object does not have a componentId specified";
+
+    internal const string MissingNodeInDependencyGraph = "Node with id {0} has not be inserted in the dependency graph";
+}

src/Microsoft.ComponentDetection.Common/Resources.cs

@@ -66,7 +66,6 @@ public static IServiceCollection AddComponentDetection(this IServiceCollection s
         services.AddSingleton<IScanExecutionService, ScanExecutionService>();
         services.AddSingleton<IDetectorProcessingService, DetectorProcessingService>();
         services.AddSingleton<IDetectorRestrictionService, DetectorRestrictionService>();
-        services.AddSingleton<IArgumentHelper, ArgumentHelper>();
 
         // Experiments
         services.AddSingleton<IExperimentService, ExperimentService>();

src/Microsoft.ComponentDetection.Common/Resources.resx

@@ -8,7 +8,6 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommandLineParser" />
         <PackageReference Include="Microsoft.Extensions.FileSystemGlobbing" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
         <PackageReference Include="Microsoft.Extensions.Logging" />
@@ -19,7 +18,6 @@
         <PackageReference Include="Spectre.Console" />
         <PackageReference Include="Spectre.Console.Cli" />
         <PackageReference Include="Spectre.Console.Cli.Extensions.DependencyInjection" />
-        <PackageReference Include="System.Runtime.Loader" />
         <PackageReference Include="System.Threading.Tasks.Dataflow" />
         <PackageReference Include="System.Reactive" />
     </ItemGroup>