diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 19668dd..120e862 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -26,6 +26,10 @@
     <!-- Paths | SGF Plugin Window -->
     <SGFWindowsPluginProjectDir>$(SGFSourceDir)Plugins\SourceGenerator.Foundations.Windows\</SGFWindowsPluginProjectDir>
     <SGFWindowsPluginProjectPath>$(SGFWindowsPluginProjectDir)SourceGenerator.Foundations.Windows.csproj</SGFWindowsPluginProjectPath>
+    
+    <!-- Local Path Overrides | Both a local build and the nuget package use the same logic. This is used to override the paths when building locally -->
+    <SGFMsBuildPath>$(SGFMSBuildProjectDir)bin\$(Configuration)\netstandard2.0\SourceGenerator.Foundations.MSBuild.dll</SGFMsBuildPath>
+    <SgfInjectorPath>$(SGFInjectorProjectDir)bin\$(Configuration)\net6.0\SourceGenerator.Foundations.Injector.exe</SgfInjectorPath>
   </PropertyGroup>
   <!-- Debug Targets -->
   <Target Name="PrintSGFPaths">
diff --git a/src/SourceGenerator.Foundations.Contracts/Diagnostics/LoggerExtensions.cs b/src/SourceGenerator.Foundations.Contracts/Diagnostics/LoggerExtensions.cs
index 075b34a..2d93448 100644
--- a/src/SourceGenerator.Foundations.Contracts/Diagnostics/LoggerExtensions.cs
+++ b/src/SourceGenerator.Foundations.Contracts/Diagnostics/LoggerExtensions.cs
@@ -1,44 +1,61 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using SGF.Diagnostics;
+using System;
 
-namespace SGF.Diagnostics
+/// <summary>
+/// Contains extension methods for working with logging in Source Generator Foundations
+/// </summary>
+public static class LoggerExtensions
 {
-    public static class LoggerExtensions
+    public static void AddSink<T>(this ILogger logger) where T : ILogSink, new()
     {
-        public static void AddSink<T>(this ILogger logger) where T: ILogSink, new()
-        {
-            logger.AddSink(new T());
-        }
+        logger.AddSink(new T());
+    }
 
-        public static void Information(this ILogger logger, string message)
-        {
-            logger.Log(LogLevel.Information, null, message);
-        }
+    /// <summary>
+    /// Adds a new info log entry 
+    /// </summary>
+    public static void Information(this ILogger logger, string message)
+    {
+        logger.Log(LogLevel.Information, null, message);
+    }
 
-        public static void Information(this ILogger logger, Exception exception, string message) 
-        {
-            logger.Log(LogLevel.Information, exception, message);
-        }
+    /// <summary>
+    /// Adds a new info log entry with an exception 
+    /// </summary>
+    public static void Information(this ILogger logger, Exception exception, string message)
+    {
+        logger.Log(LogLevel.Information, exception, message);
+    }
 
-        public static void Warning(this ILogger logger, string message)
-        {
-            logger.Log(LogLevel.Warning, null, message);
-        }
+    /// <summary>
+    /// Adds a new warning log entry 
+    /// </summary>
+    public static void Warning(this ILogger logger, string message)
+    {
+        logger.Log(LogLevel.Warning, null, message);
+    }
 
-        public static void Warning(this ILogger logger, Exception exception, string message)
-        {
-            logger.Log(LogLevel.Warning, exception, message);
-        }
+    /// <summary>
+    /// Adds a new warning entry with an exception 
+    /// </summary>
+    public static void Warning(this ILogger logger, Exception exception, string message)
+    {
+        logger.Log(LogLevel.Warning, exception, message);
+    }
 
-        public static void Error(this ILogger logger, string message)
-        {
-            logger.Log(LogLevel.Error, null, message);
-        }
+    /// <summary>
+    /// Adds a new warning entry
+    /// </summary>
+    public static void Error(this ILogger logger, string message)
+    {
+        logger.Log(LogLevel.Error, null, message);
+    }
 
-        public static void Error(this ILogger logger, Exception exception, string message)
-        {
-            logger.Log(LogLevel.Error, exception, message);
-        }
+    /// <summary>
+    /// Adds a new error entry with an exception 
+    /// </summary>
+    public static void Error(this ILogger logger, Exception exception, string message)
+    {
+        logger.Log(LogLevel.Error, exception, message);
     }
-}
+}
\ No newline at end of file
diff --git a/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets b/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets
deleted file mode 100644
index 749d1c6..0000000
--- a/src/SourceGenerator.Foundations.MSBuild/SourceGenerator.Foundations.MSBuild.targets
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <IsNuGetPackage>false</IsNuGetPackage>
-    <IsNuGetPackage Condition="Exists('$(MSBuildThisFileDirectory)..\.nupkg.metadata')">true</IsNuGetPackage>
-    <SGFTaskAssemblyPath>$(MSBuildThisFileDirectory)bin/$(Configuration)\netstandard2.0\$(MSBuildThisFileName).dll</SGFTaskAssemblyPath>
-    <SGFTaskAssemblyPath Condition="Exists('$(MSBuildThisFileName).dll')">$(MSBuildThisFileName).dll</SGFTaskAssemblyPath>
-  </PropertyGroup>
-  <UsingTask
-    TaskName="FilterAssembliesTask"
-    AssemblyFile="$(SGFTaskAssemblyPath)"/>
-</Project>
\ No newline at end of file
diff --git a/src/SourceGenerator.Foundations.Shared/IncrementalGenerator.cs b/src/SourceGenerator.Foundations.Shared/IncrementalGenerator.cs
index 1085994..5df0206 100644
--- a/src/SourceGenerator.Foundations.Shared/IncrementalGenerator.cs
+++ b/src/SourceGenerator.Foundations.Shared/IncrementalGenerator.cs
@@ -184,7 +184,7 @@ void IIncrementalGenerator.Initialize(IncrementalGeneratorInitializationContext
         {
             try
             {
-                SgfInitializationContext sgfContext = new(context, OnException);
+                SgfInitializationContext sgfContext = new(context, Logger, OnException);
 
                 OnInitialize(sgfContext);
             }
diff --git a/src/SourceGenerator.Foundations.Shared/SgfInitializationContext.cs b/src/SourceGenerator.Foundations.Shared/SgfInitializationContext.cs
index d585aea..83b93da 100644
--- a/src/SourceGenerator.Foundations.Shared/SgfInitializationContext.cs
+++ b/src/SourceGenerator.Foundations.Shared/SgfInitializationContext.cs
@@ -1,7 +1,8 @@
-#nullable enable
-using Microsoft.CodeAnalysis;
+using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Diagnostics;
+using SGF.Diagnostics;
 using System;
+using System.Reflection;
 
 namespace SGF
 {
@@ -9,10 +10,11 @@ namespace SGF
     /// Middleware wrapper around a <see cref="IncrementalGeneratorInitializationContext"/> to allow for
     /// wraping with exception handling and provide a better user expereince 
     /// </summary>
-    internal struct SgfInitializationContext
+    internal readonly struct SgfInitializationContext
     {
+        private readonly ILogger m_logger;
         private readonly Action<Exception> m_exceptionHandler;
-        private IncrementalGeneratorInitializationContext m_context;
+        private readonly IncrementalGeneratorInitializationContext m_context;
 
         public SyntaxValueProvider SyntaxProvider => m_context.SyntaxProvider;
         public IncrementalValueProvider<Compilation> CompilationProvider => m_context.CompilationProvider;
@@ -21,84 +23,93 @@ internal struct SgfInitializationContext
         public IncrementalValueProvider<AnalyzerConfigOptionsProvider> AnalyzerConfigOptionsProvider => m_context.AnalyzerConfigOptionsProvider;
         public IncrementalValuesProvider<MetadataReference> MetadataReferencesProvider => m_context.MetadataReferencesProvider;
 
-        public SgfInitializationContext(IncrementalGeneratorInitializationContext context, Action<Exception> exceptionHandler)
+        public SgfInitializationContext(
+            IncrementalGeneratorInitializationContext context, 
+            ILogger logger,
+            Action<Exception> exceptionHandler)
         {
+            m_logger = logger;
             m_context = context;
             m_exceptionHandler = exceptionHandler;
         }
 
-        public void RegisterSourceOutput<TSource>(IncrementalValueProvider<TSource> source, Action<SourceProductionContext, TSource> action)
+        public void RegisterSourceOutput<TSource>(IncrementalValueProvider<TSource> source, Action<SgfSourceProductionContext, TSource> action)
         {
+            ILogger logger = m_logger;
             Action<Exception> exceptionHandler = m_exceptionHandler;
-            Action<SourceProductionContext, TSource> wrappedAction = (context, source) =>
+
+            void wrappedAction(SourceProductionContext context, TSource source)
             {
                 try
                 {
-                    action(context, source);
+                    action(new (context, logger), source);
                 }
-                catch(Exception exception)
+                catch (Exception exception)
                 {
                     exceptionHandler(exception);
                 }
-            };
+            }
             m_context.RegisterSourceOutput(source, wrappedAction);
         }
 
-        public void RegisterSourceOutput<TSource>(IncrementalValuesProvider<TSource> source, Action<SourceProductionContext, TSource> action)
+        public void RegisterSourceOutput<TSource>(IncrementalValuesProvider<TSource> source, Action<SgfSourceProductionContext, TSource> action)
         {
+            ILogger logger = m_logger;
             Action<Exception> exceptionHandler = m_exceptionHandler;
-            Action<SourceProductionContext, TSource> wrappedAction = (context, source) =>
+            void wrappedAction(SourceProductionContext context, TSource source)
             {
                 try
                 {
-                    action(context, source);
+                    action(new (context, logger), source);
                 }
-                catch(Exception exception)
+                catch (Exception exception)
                 {
                     exceptionHandler(exception);
                 }
-            };
+            }
             m_context.RegisterSourceOutput(source, wrappedAction);
         }
 
-        public void RegisterImplementationSourceOutput<TSource>(IncrementalValueProvider<TSource> source, Action<SourceProductionContext, TSource> action)
+        public void RegisterImplementationSourceOutput<TSource>(IncrementalValueProvider<TSource> source, Action<SgfSourceProductionContext, TSource> action)
         {
+            ILogger logger = m_logger;
             Action<Exception> exceptionHandler = m_exceptionHandler;
-            Action<SourceProductionContext, TSource> wrappedAction = (context, source) =>
+            void wrappedAction(SourceProductionContext context, TSource source)
             {
                 try
                 {
-                    action(context, source);
+                    action(new(context, logger), source);
                 }
                 catch (Exception exception)
                 {
                     exceptionHandler(exception);
                 }
-            };
+            }
             m_context.RegisterImplementationSourceOutput(source, wrappedAction);
         }
 
-        public void RegisterImplementationSourceOutput<TSource>(IncrementalValuesProvider<TSource> source, Action<SourceProductionContext, TSource> action)
+        public void RegisterImplementationSourceOutput<TSource>(IncrementalValuesProvider<TSource> source, Action<SgfSourceProductionContext, TSource> action)
         {
+            ILogger logger = m_logger;
             Action<Exception> exceptionHandler = m_exceptionHandler;
-            Action<SourceProductionContext, TSource> wrappedAction = (context, source) =>
+            void wrappedAction(SourceProductionContext context, TSource source)
             {
                 try
                 {
-                    action(context, source);
+                    action(new (context, logger), source);
                 }
                 catch (Exception exception)
                 {
                     exceptionHandler(exception);
                 }
-            };
+            }
             m_context.RegisterImplementationSourceOutput(source, wrappedAction);
         }
 
         public void RegisterPostInitializationOutput(Action<IncrementalGeneratorPostInitializationContext> callback)
         {
             Action<Exception> exceptionHandler = m_exceptionHandler;
-            Action<IncrementalGeneratorPostInitializationContext> wrappedCallback = (context) =>
+            void wrappedCallback(IncrementalGeneratorPostInitializationContext context)
             {
                 try
                 {
@@ -108,7 +119,7 @@ public void RegisterPostInitializationOutput(Action<IncrementalGeneratorPostInit
                 {
                     exceptionHandler(exception);
                 }
-            };
+            }
             m_context.RegisterPostInitializationOutput(wrappedCallback);
         }
     }
diff --git a/src/SourceGenerator.Foundations.Shared/SgfSourceProductionContext.cs b/src/SourceGenerator.Foundations.Shared/SgfSourceProductionContext.cs
new file mode 100644
index 0000000..cd2b8b3
--- /dev/null
+++ b/src/SourceGenerator.Foundations.Shared/SgfSourceProductionContext.cs
@@ -0,0 +1,56 @@
+using Microsoft.CodeAnalysis.Text;
+using Microsoft.CodeAnalysis;
+using SGF.Diagnostics;
+using System.Text;
+using System.Threading;
+/// <summary>
+/// Wrapper around a <see cref="SourceProductionContext"/> used to help capture errors and report logs
+/// </summary>
+internal struct SgfSourceProductionContext
+{
+    private int m_sourceCount;
+    private readonly ILogger m_logger;
+    private readonly SourceProductionContext m_context;
+
+    /// <summary>
+    /// A token that will be cancelled when generation should stop
+    /// </summary>
+    public CancellationToken CancellationToken => m_context.CancellationToken;
+
+    internal SgfSourceProductionContext(SourceProductionContext context, ILogger logger)
+    {
+        m_sourceCount = 0;
+        m_logger = logger;
+        m_context = context;
+    }
+
+
+
+    /// <summary>
+    /// Adds source code in the form of a <see cref="string"/> to the compilation.
+    /// </summary>
+    /// <param name="hintName">An identifier that can be used to reference this source text, must be unique within this generator</param>
+    /// <param name="source">The source code to add to the compilation</param>
+    public void AddSource(string hintName, string source) => AddSource(hintName, SourceText.From(source, Encoding.UTF8));
+
+    /// <summary>
+    /// Adds a <see cref="SourceText"/> to the compilation
+    /// </summary>
+    /// <param name="hintName">An identifier that can be used to reference this source text, must be unique within this generator</param>
+    /// <param name="sourceText">The <see cref="SourceText"/> to add to the compilation</param>
+    public void AddSource(string hintName, SourceText sourceText)
+    {
+        m_sourceCount++;
+        m_logger.Information($" [AddedSource:{m_sourceCount:00}]: {hintName}");
+        m_context.AddSource(hintName, sourceText);
+    }
+
+    /// <summary>
+    /// Adds a <see cref="Diagnostic"/> to the users compilation 
+    /// </summary>
+    /// <param name="diagnostic">The diagnostic that should be added to the compilation</param>
+    /// <remarks>
+    /// The severity of the diagnostic may cause the compilation to fail, depending on the <see cref="Compilation"/> settings.
+    /// </remarks>
+    public void ReportDiagnostic(Diagnostic diagnostic) => m_context.ReportDiagnostic(diagnostic);
+}
\ No newline at end of file
diff --git a/src/SourceGenerator.Foundations.Shared/SourceGenerator.Foundations.Shared.projitems b/src/SourceGenerator.Foundations.Shared/SourceGenerator.Foundations.Shared.projitems
index bc11776..e781bb5 100644
--- a/src/SourceGenerator.Foundations.Shared/SourceGenerator.Foundations.Shared.projitems
+++ b/src/SourceGenerator.Foundations.Shared/SourceGenerator.Foundations.Shared.projitems
@@ -14,5 +14,6 @@
     <Compile Include="$(MSBuildThisFileDirectory)Reflection\AssemblyResolver.cs" Pack="True" PackagePath="sgf/src/Reflection\AssemblyResolver.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)IncrementalGenerator.cs" Pack="True" PackagePath="sgf/src/IncrementalGenerator.cs" />
     <Compile Include="$(MSBuildThisFileDirectory)SgfInitializationContext.cs" Pack="True" PackagePath="sgf/src/SgfInitializationContext.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)SgfSourceProductionContext.cs" Pack="True" PackagePath="sgf/src/SgfSourceProductionContext.cs" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/SourceGenerator.Foundations.sln b/src/SourceGenerator.Foundations.sln
index 8e46947..19e58e4 100644
--- a/src/SourceGenerator.Foundations.sln
+++ b/src/SourceGenerator.Foundations.sln
@@ -29,6 +29,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp.SourceGenerator"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGenerator.Foundations.Injector", "SourceGenerator.Foundations.Injector\SourceGenerator.Foundations.Injector.csproj", "{E9B785CC-B19E-499F-915D-7E37F727C50C}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SourceGenerator.Foundations.MSBuild", "SourceGenerator.Foundations.MSBuild\SourceGenerator.Foundations.MSBuild.csproj", "{E95587D6-78E8-48FE-9F98-371800A77B69}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{F0124C8F-B8FB-4832-9D65-D0F13E4308AE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -85,6 +89,14 @@ Global
 		{E9B785CC-B19E-499F-915D-7E37F727C50C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{E9B785CC-B19E-499F-915D-7E37F727C50C}.Release|x64.ActiveCfg = Release|Any CPU
 		{E9B785CC-B19E-499F-915D-7E37F727C50C}.Release|x64.Build.0 = Release|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Debug|x64.Build.0 = Debug|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Release|x64.ActiveCfg = Release|Any CPU
+		{E95587D6-78E8-48FE-9F98-371800A77B69}.Release|x64.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.csproj b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.csproj
index 58105b6..e4b9de5 100644
--- a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.csproj
+++ b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.csproj
@@ -1,10 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SGFSourceDir)Nuget.Build.props"/>
+  <Import Project="$(SGFSourceDir)Nuget.Build.props" />
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <IsRoslynComponent>true</IsRoslynComponent>
+    <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);CustomNugetPack</TargetsForTfmSpecificContentInPackage>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" PrivateAssets="all" />
@@ -17,6 +18,7 @@
     <None Update="SourceGenerator.Foundations.targets" Pack="True" PackagePath="build/$(AssemblyName).targets" />
     <ProjectReference Include="$(SGFContractsProjectPath)" PrivateAssets="All" />
     <ProjectReference Include="$(SGFWindowsPluginProjectPath)" PrivateAssets="All" />
+    <ProjectReference Include="$(SGFMSBuildProjectPath)" PrivateAssets="All" ReferenceOutputAssembly="False" />
     <ProjectReference Include="$(SGFInjectorProjectPath)" PrivateAssets="All" ReferenceOutputAssembly="False">
       <SetTargetFramework>TargetFramework=net6.0</SetTargetFramework>
     </ProjectReference>
@@ -24,4 +26,12 @@
 
   <Import Project="$(SGFSharedProjectItemsPath)" Label="Shared" />
   <Import Project="$(SGFTargetsPath)" />
+
+  <Target Name="CustomNugetPack">
+    <ItemGroup>
+      <TfmSpecificPackageFile  Include="$(SGFMsBuildPath)">
+        <PackagePath>build/</PackagePath>
+      </TfmSpecificPackageFile >
+    </ItemGroup>
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.props b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.props
index 5d51f41..32e801d 100644
--- a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.props
+++ b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.props
@@ -11,6 +11,8 @@
     <IsRoslynComponent>true</IsRoslynComponent>
     <IsNuGetPackage>false</IsNuGetPackage>
     <IsNuGetPackage Condition="Exists('$(MSBuildThisFileDirectory)..\.nupkg.metadata')">true</IsNuGetPackage>
+    <SgfMsBuildPath Condition="$(SgfMsBuildPath) == ''">$(MSBuildThisFileDirectory)SourceGenerator.Foundations.MSBuild.dll</SgfMsBuildPath>
+    <SgfInjectorPath Condition="$(SgfInjectorPath) == ''">$(MSBuildThisFileDirectory)SourceGenerator.Foundations.Injector.exe</SgfInjectorPath>
   </PropertyGroup>
   <ItemGroup>
     <CompilerVisibleProperty Include="RootNamespace" />
diff --git a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
index 455fccc..4be6795 100644
--- a/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
+++ b/src/SourceGenerator.Foundations/SourceGenerator.Foundations.targets
@@ -5,15 +5,10 @@
     from Directory.Build.[props|targets] as these files
     won't exist.
    ==================================================-->
-  <PropertyGroup>
-    <SgfInjectorPath>$(MSBuildThisFileDirectory)..\sgf\injector\SourceGenerator.Foundations.Injector.exe</SgfInjectorPath>
-    <SgfInjectorPath Condition="'$(SGFInjectorProjectDir)' != ''">$(SGFInjectorProjectDir)bin\$(Configuration)\net6.0\SourceGenerator.Foundations.Injector.exe</SgfInjectorPath>
-  </PropertyGroup>
-  <Import Condition="Exists('$(MSBuildThisFileDirectory)SourceGenerator.Foundations.MSBuild.targets')" Project="$(MSBuildThisFileDirectory)SourceGenerator.Foundations.MSBuild.targets"/>
-  <Import Condition="'$(SGFMSBuildProjectDir)' !=''" Project="$(SGFMSBuildProjectDir)SourceGenerator.Foundations.MSBuild.targets"/>
+  <UsingTask TaskName="FilterAssembliesTask"  AssemblyFile="$(SGFMsBuildPath)"/>
   <Target Name="SGF_EmbedDependencies" AfterTargets="ResolveAssemblyReferences">
     <FilterAssembliesTask Assemblies="@(ReferencePath->'%(RootDir)%(Directory)%(Filename)%(Extension)')">
-      <Output TaskParameter="FilteredAssemblies" ItemName="SGF_FilteredAssembly"/>
+      <Output TaskParameter="FilteredAssemblies" ItemName="SGF_FilteredAssembly" />
     </FilterAssembliesTask>
     <!-- Embedded Assemblies -->
     <ItemGroup>
@@ -28,14 +23,18 @@
     </ItemGroup>
   </Target>
   <Target Name="SGFAddInitializer" AfterTargets="AfterBuild" Condition="'$(SgfInjectorPath)' != ''">
-    <Exec Command="$(SgfInjectorPath) SGF.Reflection.AssemblyResolver Initialize $(TargetPath)"/>
+    <Exec Command="$(SgfInjectorPath) SGF.Reflection.AssemblyResolver Initialize $(TargetPath)" />
   </Target>
   <!-- Validates they are targeting 'netstandard2.0-->
-  <Target Name="SGF_TargetFrameworkValidation" BeforeTargets="CoreCompile" Condition="'$(TargetFramework)' != 'netstandard2.0'">
-    <Error Text="[SourceGenerator.Foundations] The project $(MSBuildProjectName) is currently using the target framework '$(TargetFramework)' which is an error. All source generators must use the target framework 'netstandard2.0'. You can read how to change it here https://learn.microsoft.com/en-us/dotnet/standard/frameworks"/>
+  <Target Name="SGF_TargetFrameworkValidation" BeforeTargets="CoreCompile"
+    Condition="'$(TargetFramework)' != 'netstandard2.0'">
+    <Error
+      Text="[SourceGenerator.Foundations] The project $(MSBuildProjectName) is currently using the target framework '$(TargetFramework)' which is an error. All source generators must use the target framework 'netstandard2.0'. You can read how to change it here https://learn.microsoft.com/en-us/dotnet/standard/frameworks" />
   </Target>
   <!-- Validates they are at least using LangVersion 7.3 for nullable refernece types-->
-  <Target Name="SGF_LangVersionValidation" BeforeTargets="CoreCompile" Condition="'$(LangVersion)' == '7.2' OR '$(LangVersion)' == '7.1' OR '$(LangVersion)' == '7' OR '$(LangVersion)' == '6' OR '$(LangVersion)' == '5' OR '$(LangVersion)' == '4' OR '$(LangVersion)' == '3' OR '$(LangVersion)' == '2' OR '$(LangVersion)' == 'ISO-2' OR '$(LangVersion)' == 'ISO-1' OR '$(LangVersion)' == '1' OR '$(LangVersion)' == '7.3' OR '$(LangVersion)' == '8.0'">
-    <Error Text="[SourceGenerator.Foundations] The project $(MSBuildProjectName) is currently using the language version $(LangVersion) which does not meet the minimum required of 9.0. Read how to change it here https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version"/>
+  <Target Name="SGF_LangVersionValidation" BeforeTargets="CoreCompile"
+    Condition="'$(LangVersion)' == '7.2' OR '$(LangVersion)' == '7.1' OR '$(LangVersion)' == '7' OR '$(LangVersion)' == '6' OR '$(LangVersion)' == '5' OR '$(LangVersion)' == '4' OR '$(LangVersion)' == '3' OR '$(LangVersion)' == '2' OR '$(LangVersion)' == 'ISO-2' OR '$(LangVersion)' == 'ISO-1' OR '$(LangVersion)' == '1' OR '$(LangVersion)' == '7.3' OR '$(LangVersion)' == '8.0'">
+    <Error
+      Text="[SourceGenerator.Foundations] The project $(MSBuildProjectName) is currently using the language version $(LangVersion) which does not meet the minimum required of 9.0. Read how to change it here https://learn.microsoft.com/en-us/dotnet/csharp/language-reference/configure-language-version" />
   </Target>
 </Project>
\ No newline at end of file