diff --git a/src/Microsoft.Sbom.Targets/GenerateSbom.cs b/src/Microsoft.Sbom.Targets/GenerateSbom.cs
new file mode 100644
index 000000000..18e6fa623
--- /dev/null
+++ b/src/Microsoft.Sbom.Targets/GenerateSbom.cs
@@ -0,0 +1,106 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.Sbom.Targets;
+
+using System;
+using System.Collections.Generic;
+using System.Diagnostics.Tracing;
+using Microsoft.Build.Framework;
+
+/// <summary>
+/// This partial class defines and sanitizes the arguments that will be passed
+/// into the SBOM API and CLI tool for generation.
+/// </summary>
+public partial class GenerateSbom
+{
+    /// <summary>
+    /// Gets or sets the path to the drop directory for which the SBOM will be generated.
+    /// </summary>
+    [Required]
+    public string BuildDropPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the supplier of the package the SBOM represents.
+    /// </summary>
+    [Required]
+    public string PackageSupplier { get; set; }
+
+    /// <summary>
+    /// Gets or sets the name of the package the SBOM represents.
+    /// </summary>
+    [Required]
+    public string PackageName { get; set; }
+
+    /// <summary>
+    /// Gets or sets the version of the package the SBOM represents.
+    /// </summary>
+    [Required]
+    public string PackageVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the base path of the SBOM namespace uri.
+    /// </summary>
+    [Required]
+    public string NamespaceBaseUri { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to the directory containing build components and package information.
+    /// For example, path to a .csproj or packages.config file.
+    /// </summary>
+    public string BuildComponentPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets a unique URI part that will be appended to NamespaceBaseUri.
+    /// </summary>
+    public string NamespaceUriUniquePart { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to a file containing a list of external SBOMs that will be appended to the
+    /// SBOM that is being generated.
+    /// </summary>
+    public string ExternalDocumentListFile { get; set; }
+
+    /// <summary>
+    /// Indicates whether licensing information will be fetched for detected packages.
+    /// </summary>
+    public bool FetchLicenseInformation { get; set; }
+
+    /// <summary>
+    /// Indicates whether to parse licensing and supplier information from a packages metadata file.
+    /// </summary>
+    public bool EnablePackageMetadataParsing { get; set; }
+
+    /// <summary>
+    /// Gets or sets the verbosity level for logging output.
+    /// </summary>
+    public string Verbosity { get; set; }
+
+    /// <summary>
+    /// Gets or sets a list of names and versions of the manifest format being used.
+    /// </summary>
+    public string ManifestInfo { get; set; }
+
+    /// <summary>
+    /// Indicates whether the previously generated SBOM manifest directory should be deleted
+    /// before generating a new SBOM in the directory specified by ManifestDirPath.
+    /// Defaults to true.
+    /// </summary>
+    public bool DeleteManifestDirIfPresent { get; set; } = true;
+
+    /// <summary>
+    /// Gets or sets the path where the SBOM will be generated.
+    /// </summary>
+    public string ManifestDirPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to the SBOM CLI tool
+    /// </summary>
+    public string SbomToolPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the path to the generated SBOM directory.
+    /// </summary>
+    [Output]
+    public string SbomPath { get; set; }
+}
diff --git a/src/Microsoft.Sbom.Targets/GenerateSbomTask.cs b/src/Microsoft.Sbom.Targets/GenerateSbomTask.cs
index 6225a0370..09bf332d0 100644
--- a/src/Microsoft.Sbom.Targets/GenerateSbomTask.cs
+++ b/src/Microsoft.Sbom.Targets/GenerateSbomTask.cs
@@ -27,98 +27,14 @@ namespace Microsoft.Sbom.Targets;
 /// <summary>
 /// MSBuild task for generating SBOMs from build output.
 /// </summary>
-public class GenerateSbomTask : Task
+public partial class GenerateSbom : Task
 {
-    /// <summary>
-    /// The path to the drop directory for which the SBOM will be generated.
-    /// </summary>
-    [Required]
-    public string BuildDropPath { get; set; }
-
-    /// <summary>
-    /// Supplier of the package the SBOM represents.
-    /// </summary>
-    [Required]
-    public string PackageSupplier { get; set; }
-
-    /// <summary>
-    /// Name of the package the SBOM represents.
-    /// </summary>
-    [Required]
-    public string PackageName { get; set; }
-
-    /// <summary>
-    /// Version of the package the SBOM represents.
-    /// </summary>
-    [Required]
-    public string PackageVersion { get; set; }
-
-    /// <summary>
-    /// The base path of the SBOM namespace uri.
-    /// </summary>
-    [Required]
-    public string NamespaceBaseUri { get; set; }
-
-    /// <summary>
-    /// The path to the directory containing build components and package information.
-    /// For example, path to a .csproj or packages.config file.
-    /// </summary>
-    public string BuildComponentPath { get; set; }
-
-    /// <summary>
-    /// A unique URI part that will be appended to NamespaceBaseUri.
-    /// </summary>
-    public string NamespaceUriUniquePart { get; set; }
-
-    /// <summary>
-    /// The path to a file containing a list of external SBOMs that will be appended to the
-    /// SBOM that is being generated.
-    /// </summary>
-    public string ExternalDocumentListFile { get; set; }
-
-    /// <summary>
-    /// If true, it will fetch licensing information for detected packages.
-    /// </summary>
-    public bool FetchLicenseInformation { get; set; }
-
-    /// <summary>
-    /// If true, it will parse licensing and supplier information from a packages metadata file.
-    /// </summary>
-    public bool EnablePackageMetadataParsing { get; set; }
-
-    /// <summary>
-    /// Determines how detailed the outputed logging will be.
-    /// </summary>
-    public string Verbosity { get; set; }
-
-    /// <summary>
-    /// A list of the name and version of the manifest format being used.
-    /// </summary>
-    public string ManifestInfo { get; set; }
-
-    /// <summary>
-    /// If true, it will delete the previously generated SBOM manifest directory before
-    /// generating a new SBOM in ManifestDirPath.
-    /// </summary>
-    public bool DeleteManifestDirIfPresent { get; set; } = true;
-
-    /// <summary>
-    /// The path where the SBOM will be generated.
-    /// </summary>
-    public string ManifestDirPath { get; set; }
-
-    /// <summary>
-    /// The path to the generated SBOM directory.
-    /// </summary>
-    [Output]
-    public string SbomPath { get; set; }
-
     private ISBOMGenerator Generator { get; set; }
 
     /// <summary>
     /// Constructor for the GenerateSbomTask.
     /// </summary>
-    public GenerateSbomTask()
+    public GenerateSbom()
     {
         var host = Host.CreateDefaultBuilder()
             .ConfigureServices((host, services) =>
diff --git a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj
index e2f4729bb..a2c94d9ec 100644
--- a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj
+++ b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <AssemblyName>Microsoft.Sbom.Targets</AssemblyName>
+    <TargetFrameworks>net8.0;net472</TargetFrameworks>
     <RuntimeIdentifiers>win-x64;osx-x64;linux-x64</RuntimeIdentifiers>
     <IsPublishable>true</IsPublishable>
     <IsPackable>true</IsPackable>
@@ -10,6 +11,7 @@
     <Title>GenerateSbomTask</Title>
     <Description>Tasks and targets for running the SBOM tool.</Description>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+    <SbomCLIToolTargetFramework>net8.0</SbomCLIToolTargetFramework>
 
     <!-- This target will run when MSBuild is collecting the files to be packaged, and we'll implement it below. This property controls the dependency list for this packaging process, so by adding our custom property we hook ourselves into the process in a supported way. -->
     <TargetsForTfmSpecificBuildOutput>
@@ -17,6 +19,7 @@
     </TargetsForTfmSpecificBuildOutput>
     <!-- This property tells MSBuild where the root folder of the package's build assets should be. Because we are not a library package, we should not pack to 'lib'. Instead, we choose 'tasks' by convention. -->
     <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
+    <IncludeBuildOutput>true</IncludeBuildOutput>
     <!-- NuGet does validation that libraries in a package are exposed as dependencies, but we _explicitly_ do not want that behavior for MSBuild tasks. They are isolated by design. Therefore we ignore this specific warning. -->
     <NoWarn>NU5100</NoWarn>
     <!-- Suppress NuGet warning NU5128. -->
@@ -39,6 +42,19 @@
     </ItemGroup>
   </Target>
 
+  <!-- Include the SBOM CLI Tool to the .NET Framework package folder. -->
+   <Target Name="AddSbomToolToPackage" AfterTargets="Build">
+    <MSBuild Projects="..\Microsoft.Sbom.Tool\Microsoft.Sbom.Tool.csproj" Properties="TargetFramework=$(SbomCLIToolTargetFramework)" Targets="Publish" />
+    <ItemGroup>
+      <Content  Include="..\Microsoft.Sbom.Tool\bin\$(Configuration)\$(SbomCLIToolTargetFramework)\publish\*" Pack="true">
+        <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        <PackageCopyToOutput>true</PackageCopyToOutput>
+        <PackagePath>\tasks\net472\sbom-tool\</PackagePath>
+        <Visible>true</Visible>
+      </Content>
+    </ItemGroup>
+  </Target> 
+
   <ItemGroup>
     <!-- these lines pack the build props/targets files to the `build` folder in the generated package.
         by convention, the .NET SDK will look for build\<Package Id>.props and build\<Package Id>.targets
@@ -52,6 +68,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Microsoft.Sbom.Extensions.DependencyInjection\Microsoft.Sbom.Extensions.DependencyInjection.csproj" />
+    <ProjectReference Condition="'$(TargetFramework)'=='net8.0'" Include="..\Microsoft.Sbom.Extensions.DependencyInjection\Microsoft.Sbom.Extensions.DependencyInjection.csproj" PrivateAssets="all" />
+    <ProjectReference Condition="'$(TargetFramework)'=='net8.0'" Include="..\Microsoft.Sbom.Tool\Microsoft.Sbom.Tool.csproj" PrivateAssets="all" IncludeAssets="output" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+    <Compile Remove="**/*.*" />
+    <Compile Include="GenerateSbom.cs" />
+    <Compile Include="SbomCLIToolTask.cs" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' != 'net472'">
+    <Compile Remove="SbomCLIToolTask.cs" />
   </ItemGroup>
+
 </Project>
diff --git a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets
index 25825534d..f7cad1b69 100644
--- a/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets
+++ b/src/Microsoft.Sbom.Targets/Microsoft.Sbom.Targets.targets
@@ -1,7 +1,7 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-    <!-- TODO remove hardcoded str, reference this assembly using MSBuild props instead -->
+  <!-- TODO remove hardcoded str, reference this assembly using MSBuild props instead -->
 
-    <!--TODO we will eventaully want to replace or remove `AfterTargets="Build"`.
+  <!--TODO we will eventaully want to replace or remove `AfterTargets="Build"`.
         Including this line means that this code will run at the end of `dotnet build`s of any project that this .targets
         file is imported to (see line 24 of Microsoft.Sbom.Targets.csproj as an example of importing this file). This is
         good for testing purposes, but not the behavior we ultimately want. 
@@ -9,14 +9,21 @@
         target and if so, which one. They likely know of a nuget packaging target that it would make sense to hook this in with.-->
 
   <PropertyGroup>
-    <GenerateSbomTask_TFM Condition=" '$(TargetFramework)' == 'net6.0' ">net6.0</GenerateSbomTask_TFM>
-    <GenerateSbomTask_TFM Condition=" '$(TargetFramework)' == 'net8.0' ">net8.0</GenerateSbomTask_TFM>
+    <GenerateSbom_TFM Condition=" '$(MSBuildRuntimeType)' == 'Full' ">net472</GenerateSbom_TFM>
+    <GenerateSbom_TFM Condition=" '$(MSBuildRuntimeType)' == 'Core' ">net8.0</GenerateSbom_TFM>
+
+    <!--Set the SBOM CLI Tool path. This variable is only used in SbomCLIToolTask.cs-->
+    <SbomToolPath Condition=" '$(MSBuildRuntimeType)' == 'Full'">$(MSBuildThisFileDirectory)\..\tasks\$(GenerateSbom_TFM)\sbom-tool</SbomToolPath>
   </PropertyGroup>
-  <UsingTask TaskName="Microsoft.Sbom.Targets.GenerateSbomTask" AssemblyFile="$(MSBuildThisFileDirectory)\..\tasks\$(GenerateSbomTask_TFM)\Microsoft.Sbom.Targets.dll" />
+  
+  <!--Based on the MSBuild runtime, GenerateSbom will either pull the GenerateSbomTask or SbomCLIToolTask logic-->
+  <UsingTask TaskName="Microsoft.Sbom.Targets.GenerateSbom" AssemblyFile="$(MSBuildThisFileDirectory)\..\tasks\$(GenerateSbom_TFM)\Microsoft.Sbom.Targets.dll" />
+
   <Import Project="$(MSBuildThisFileDirectory)\Microsoft.Sbom.Targets.props" />
 
-  <Target Name="GenerateSbomTarget" AfterTargets="Build" Condition=" '$(GenerateSBOM)' ==  'true' And '$(MSBuildRuntimeType)' == 'Core'">
-    <GenerateSbomTask
+  <Target Name="GenerateSbomTarget" AfterTargets="Build" Condition=" '$(GenerateSBOM)' ==  'true'">
+    <!--TODO: Add arguments for ToolTask-->
+    <GenerateSbom
         BuildDropPath="$(SbomGenerationBuildDropPath)"
         BuildComponentPath="$(SbomGenerationBuildComponentPath)"
         PackageSupplier="$(SbomGenerationPackageSupplier)"
@@ -30,9 +37,10 @@
         Verbosity="$(SbomGenerationVerbosity)"
         ManifestInfo="$(SbomGenerationManifestInfo)"
         DeleteManifestDirIfPresent="$(SbomGenerationDeleteManifestDirIfPresent)"
-        ManifestDirPath="$(SbomGenerationManifestDirPath)">
-        <Output TaskParameter="SbomPath" PropertyName="SbomPathResult" />
-    </GenerateSbomTask> 
+        ManifestDirPath="$(SbomGenerationManifestDirPath)"
+        SbomToolPath="$(SbomToolPath)">
+      <Output TaskParameter="SbomPath" PropertyName="SbomPathResult" />
+    </GenerateSbom>
     <Message Importance="High" Text="Task result: $(SbomPathResult)" />
 
     <!-- Include the generated SBOM contents within the consumer's nuget package -->
diff --git a/src/Microsoft.Sbom.Targets/SbomCLIToolTask.cs b/src/Microsoft.Sbom.Targets/SbomCLIToolTask.cs
new file mode 100644
index 000000000..94e8f4759
--- /dev/null
+++ b/src/Microsoft.Sbom.Targets/SbomCLIToolTask.cs
@@ -0,0 +1,43 @@
+// Copyright (c) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+namespace Microsoft.Sbom.Targets;
+
+using System.IO;
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+/// <summary>
+/// MSBuild ToolTask for generating an SBOM using the SBOM CLI tool
+/// </summary>
+public partial class GenerateSbom : ToolTask
+{
+    protected override string ToolName => "Microsoft.Sbom.Tool";
+
+    /// <summary>
+    /// Get full path to SBOM CLI tool.
+    /// </summary>
+    /// <returns></returns>
+    protected override string GenerateFullPathToTool()
+    {
+        return Path.Combine(this.SbomToolPath, $"{this.ToolName}.exe");
+    }
+
+    /// <summary>
+    /// Return a formatted list of arguments for the SBOM CLI tool.
+    /// </summary>
+    /// <returns>string list of args</returns>
+    protected override string GenerateCommandLineCommands()
+    {
+        return "Command";
+    }
+
+    /// <summary>
+    /// Validates the SBOM CLI tool parameters
+    /// </summary>
+    /// <returns></returns>
+    protected override bool ValidateParameters()
+    {
+        return true;
+    }
+}
diff --git a/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSBomTaskInputTests.cs b/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSBomTaskInputTests.cs
index a91dbaa99..84ae06889 100644
--- a/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSBomTaskInputTests.cs
+++ b/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSBomTaskInputTests.cs
@@ -55,7 +55,7 @@ public void Cleanup() {
     }
 
     /// <summary>
-    /// Test for ensuring the GenerateSbomTask fails for null or empty inputs for
+    /// Test for ensuring the GenerateSbom fails for null or empty inputs for
     /// required params, which includes BuildDropPath, PackageSupplier, PackageName,
     /// PackageVersion, and NamespaceBaseUri.
     /// </summary>
@@ -71,7 +71,7 @@ public void Sbom_Fails_With_Null_Empty_And_WhiteSpace_Required_Params(
         string namespaceBaseUri)
     {
         // Arrange.
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = buildDropPath,
             PackageSupplier = packageSupplier,
@@ -117,7 +117,7 @@ private static IEnumerable<object[]> GetWhiteSpace_Tabs_NewLineParamsData()
     }
 
     /// <summary>
-    /// Test for ensuring the GenerateSbomTask fails when user provides an
+    /// Test for ensuring the GenerateSbom fails when user provides an
     /// invalid URI format.
     /// </summary>
     [TestMethod]
@@ -130,7 +130,7 @@ private static IEnumerable<object[]> GetWhiteSpace_Tabs_NewLineParamsData()
     public void Sbom_Fails_With_Invalid_NamespaceBaseUri(string namespaceBaseUri)
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
@@ -149,7 +149,7 @@ public void Sbom_Fails_With_Invalid_NamespaceBaseUri(string namespaceBaseUri)
     }
 
     /// <summary>
-    /// Test for ensuring the GenerateSbomTask fails when user provides
+    /// Test for ensuring the GenerateSbom fails when user provides
     /// an invalid GUID for NamespaceUriUniquePart.
     /// </summary>
     [TestMethod]
@@ -165,7 +165,7 @@ public void Sbom_Fails_With_Invalid_NamespaceBaseUri(string namespaceBaseUri)
     public void Sbom_Generation_Fails_For_Invalid_NamespaceUriUniquePart(string namespaceUriUniquePart)
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
@@ -185,7 +185,7 @@ public void Sbom_Generation_Fails_For_Invalid_NamespaceUriUniquePart(string name
     }
 
     /// <summary>
-    /// Test for ensuring GenerateSbomTask assigns a defualt Verbosity
+    /// Test for ensuring GenerateSbom assigns a defualt Verbosity
     /// level when null input is provided.
     /// </summary>
     [TestMethod]
@@ -197,7 +197,7 @@ public void Sbom_Generation_Succeeds_For_Null_Verbosity()
         var pattern = new Regex("Verbosity=.*Value=Verbose");
         var stringWriter = new StringWriter();
         Console.SetOut(stringWriter);
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
@@ -219,7 +219,7 @@ public void Sbom_Generation_Succeeds_For_Null_Verbosity()
     }
 
     /// <summary>
-    /// Test for ensuring GenerateSbomTask assigns a default Verbosity for
+    /// Test for ensuring GenerateSbom assigns a default Verbosity for
     /// unrecognized input.
     /// </summary>
     [TestMethod]
@@ -231,7 +231,7 @@ public void Sbom_Generation_Succeeds_For_Invalid_Verbosity()
         var pattern = new Regex("Verbosity=.*Value=Verbose");
         var stringWriter = new StringWriter();
         Console.SetOut(stringWriter);
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
@@ -253,7 +253,7 @@ public void Sbom_Generation_Succeeds_For_Invalid_Verbosity()
     }
 
     /// <summary>
-    /// Test to ensure GenerateSbomTask correctly parses and provides each EventLevel verbosity
+    /// Test to ensure GenerateSbom correctly parses and provides each EventLevel verbosity
     /// values to the SBOM API.
     /// </summary>
     [TestMethod]
@@ -269,7 +269,7 @@ public void Sbom_Generation_Assigns_Correct_Verbosity_IgnoreCase(string inputVer
         var pattern = new Regex($"Verbosity=.*Value={mappedVerbosity}");
         var stringWriter = new StringWriter();
         Console.SetOut(stringWriter);
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
diff --git a/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs b/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs
index aa054b484..c43d072db 100644
--- a/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs
+++ b/test/Microsoft.Sbom.Targets.Tests/AbstractGenerateSbomTaskTests.cs
@@ -12,7 +12,7 @@
 namespace Microsoft.Sbom.Targets.Tests;
 
 /// <summary>
-/// Base class for testing SBOM generation through the GenerateSbomTask.
+/// Base class for testing SBOM generation through the GenerateSbom.
 /// </summary>
 [TestClass]
 public abstract class AbstractGenerateSbomTaskTests
@@ -62,7 +62,7 @@ public void Startup()
     public void Sbom_Is_Successfully_Generated()
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
@@ -92,7 +92,7 @@ public void Sbom_Is_Successfully_Generated()
     public void Sbom_Is_Successfully_Generated_Valid_URI(string namespaceBaseUri)
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
@@ -118,7 +118,7 @@ public void Sbom_Is_Successfully_Generated_Valid_URI(string namespaceBaseUri)
     public void Sbom_Is_Successfully_Generated_Valid_RequiredParams(string packageSupplier, string packageName, string packageVersion)
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = packageSupplier,
@@ -167,7 +167,7 @@ public void Sbom_Is_Successfully_Generated_In_Specified_Location()
         var manifestDirPath = Path.Combine(TemporaryDirectory, "sub-directory");
         Directory.CreateDirectory(manifestDirPath);
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             ManifestDirPath = manifestDirPath,
@@ -193,7 +193,7 @@ public void Sbom_Is_Successfully_Generated_In_Specified_Location()
     public void Sbom_Generation_Fails_With_NotFound_BuildDropPath()
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = ".\\non-existent\\path",
             PackageSupplier = PackageSupplier,
@@ -215,7 +215,7 @@ public void Sbom_Generation_Fails_With_NotFound_BuildDropPath()
     public void Sbom_Generation_Fails_With_NotFound_BuildComponentPath()
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             BuildComponentPath = ".\\non-existent\\path",
@@ -239,7 +239,7 @@ public void Sbom_Generation_Fails_With_NotFound_BuildComponentPath()
     public void Sbom_Generation_Fails_With_NotFound_ExternalDocumentListFile()
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             ExternalDocumentListFile = ".\\non-existent\\path",
@@ -263,7 +263,7 @@ public void Sbom_Generation_Fails_With_NotFound_ExternalDocumentListFile()
     public void Sbom_Generation_Fails_With_NotFound_ManifestDirPath()
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             ManifestDirPath = ".\\non-existent\\path",
@@ -290,7 +290,7 @@ public void Sbom_Is_Successfully_Generated_With_Component_Path()
         var sourceDirectory = Path.Combine(CurrentDirectory, "..", "..", "..");
 
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             BuildComponentPath = sourceDirectory,
@@ -318,7 +318,7 @@ public void Sbom_Is_Successfully_Generated_With_Component_Path()
     public void Sbom_Is_Successfully_Generated_With_Unique_Namespace_Part_Defined(string uniqueNamespacePart)
     {
         // Arrange
-        var task = new GenerateSbomTask
+        var task = new GenerateSbom
         {
             BuildDropPath = CurrentDirectory,
             PackageSupplier = PackageSupplier,
diff --git a/test/Microsoft.Sbom.Targets.Tests/Microsoft.Sbom.Targets.Tests.csproj b/test/Microsoft.Sbom.Targets.Tests/Microsoft.Sbom.Targets.Tests.csproj
index 09913734f..4278eba17 100644
--- a/test/Microsoft.Sbom.Targets.Tests/Microsoft.Sbom.Targets.Tests.csproj
+++ b/test/Microsoft.Sbom.Targets.Tests/Microsoft.Sbom.Targets.Tests.csproj
@@ -17,6 +17,8 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\src\Microsoft.Sbom.Targets\Microsoft.Sbom.Targets.csproj" />
+    <ProjectReference Include="..\..\src\Microsoft.Sbom.Extensions.DependencyInjection\Microsoft.Sbom.Extensions.DependencyInjection.csproj"/>
+    <ProjectReference Include="..\..\src\Microsoft.Sbom.Tool\Microsoft.Sbom.Tool.csproj"/>
   </ItemGroup>
 
 </Project>