From 4c413acbe215f1bc158d6956378c77e844e71a1c Mon Sep 17 00:00:00 2001
From: PieterjanDeClippel <pieterjandeclippel@msn.com>
Date: Thu, 25 Sep 2025 14:37:35 +0200
Subject: [PATCH 1/2] Temp commit

---
 .../MintPlayer.ValueComparerGenerator.csproj                  | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj
index 230590fd..1db23dfd 100644
--- a/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj
+++ b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj
@@ -29,10 +29,6 @@
 		<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
 	</ItemGroup>
 
-	<ItemGroup>
-	  <Compile Remove="Producers\ValueComparersProducer.cs" />
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="..\MintPlayer.ValueComparerGenerator.Attributes\MintPlayer.ValueComparerGenerator.Attributes.csproj" />
 	</ItemGroup>

From 5da9c7bdb6a4ecc6181ab8e3798152a3a8166e80 Mon Sep 17 00:00:00 2001
From: PieterjanDeClippel <pieterjandeclippel@msn.com>
Date: Thu, 25 Sep 2025 15:37:46 +0200
Subject: [PATCH 2/2] Temp commit

---
 .../MintPlayer.Mapper.csproj                  |  5 ++
 .../Targets/mappergenerator.props             | 10 +++
 .../Targets/mappergenerator.targets           | 19 +++++
 .../dependencyinjection.targets               | 13 ++--
 .../mappergenerator.targets                   | 30 --------
 .../newtonsoftjson.targets                    | 17 ++---
 .../sourcegenerator.targets                   | 69 -------------------
 .../valuecomparergenerator.targets            | 30 --------
 .../Targets/sourcegenerator_tools.targets     |  5 +-
 .../MintPlayer.ValueComparerGenerator.csproj  |  8 ++-
 .../Targets/valuecomparergenerator.props      | 10 +++
 .../Targets/valuecomparergenerator.targets    | 22 ++++++
 SourceGenerators/eng/sourcegenerator.targets  | 38 ----------
 13 files changed, 88 insertions(+), 188 deletions(-)
 create mode 100644 SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.props
 create mode 100644 SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.targets
 delete mode 100644 SourceGenerators/MintPlayer.SourceGenerators.Targets/mappergenerator.targets
 delete mode 100644 SourceGenerators/MintPlayer.SourceGenerators.Targets/sourcegenerator.targets
 delete mode 100644 SourceGenerators/MintPlayer.SourceGenerators.Targets/valuecomparergenerator.targets
 create mode 100644 SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.props
 create mode 100644 SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.targets

diff --git a/SourceGenerators/Mapper/MintPlayer.Mapper/MintPlayer.Mapper.csproj b/SourceGenerators/Mapper/MintPlayer.Mapper/MintPlayer.Mapper.csproj
index dd854979..08163beb 100644
--- a/SourceGenerators/Mapper/MintPlayer.Mapper/MintPlayer.Mapper.csproj
+++ b/SourceGenerators/Mapper/MintPlayer.Mapper/MintPlayer.Mapper.csproj
@@ -27,6 +27,11 @@
 		<!--<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>-->
 	</PropertyGroup>
 
+	<ItemGroup>
+		<None Include="Targets\mappergenerator.props" Pack="true" PackagePath="build/$(PackageId).props" />
+		<None Include="Targets\mappergenerator.targets" Pack="true" PackagePath="build/$(PackageId).targets" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<!-- Dependency DLLs -->
 		<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.Mapper.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
diff --git a/SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.props b/SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.props
new file mode 100644
index 00000000..9cb5f05f
--- /dev/null
+++ b/SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<ItemGroup>
+		<!-- Put the assets for this project in the correct package path -->
+		<!-- Rolsyn 4.0 + Rolsyn 4.9 -->
+		<None Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
+	</ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.targets b/SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.targets
new file mode 100644
index 00000000..204502b2
--- /dev/null
+++ b/SourceGenerators/Mapper/MintPlayer.Mapper/Targets/mappergenerator.targets
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<PropertyGroup>
+		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsMapper</GetTargetPathDependsOn>
+	</PropertyGroup>
+
+	<Target Name="GetDependencyTargetPathsMapper">
+		<!-- Include dependency DLLs and put them in the correct package path -->
+		<ItemGroup>
+			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_Mapper_Attributes)\lib\netstandard2.0\MintPlayer.Mapper.Attributes.dll" IncludeRuntimeDependency="true" />
+		</ItemGroup>
+	</Target>
+
+	<Target Name="MapperGenerator_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
+		<Error Condition="'$(PkgMintPlayer_MapperGenerator_Attributes)' == ''"
+			   Text="Please add GeneratePathProperty=&quot;true&quot; on the MintPlayer.MapperGenerator.Attributes PackageReference." />
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/SourceGenerators/MintPlayer.SourceGenerators.Targets/dependencyinjection.targets b/SourceGenerators/MintPlayer.SourceGenerators.Targets/dependencyinjection.targets
index 815071e1..c5b69a1e 100644
--- a/SourceGenerators/MintPlayer.SourceGenerators.Targets/dependencyinjection.targets
+++ b/SourceGenerators/MintPlayer.SourceGenerators.Targets/dependencyinjection.targets
@@ -1,14 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" PrivateAssets="all" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0-rc.1.25451.107" PrivateAssets="all" GeneratePathProperty="true" />
-	</ItemGroup>
-
 	<PropertyGroup>
 		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsDependencyInjection</GetTargetPathDependsOn>
 	</PropertyGroup>
@@ -27,4 +19,9 @@
 			<TargetPathWithTargetPlatformMoniker Include="$(PKGMicrosoft_Extensions_DependencyInjection_Abstractions)\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll" IncludeRuntimeDependency="false" />
 		</ItemGroup>
 	</Target>
+
+	<Target Name="MintPlayer_DependencyInjection_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
+		<Error Condition="'$(PkgMicrosoft_Extensions_DependencyInjection_Abstractions)' == ''"
+			   Text="Please add GeneratePathProperty=&quot;true&quot; on the Microsoft.Extensions.DependencyInjection.Abstractions PackageReference." />
+	</Target>
 </Project>
\ No newline at end of file
diff --git a/SourceGenerators/MintPlayer.SourceGenerators.Targets/mappergenerator.targets b/SourceGenerators/MintPlayer.SourceGenerators.Targets/mappergenerator.targets
deleted file mode 100644
index 8e1afbb5..00000000
--- a/SourceGenerators/MintPlayer.SourceGenerators.Targets/mappergenerator.targets
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
-		<PackageReference Include="MintPlayer.Mapper" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" GeneratePathProperty="true" />
-		<PackageReference Include="MintPlayer.Mapper.Attributes" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
-		<PackageReference Include="MintPlayer.Mapper" Version="6.3.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" GeneratePathProperty="true" />
-		<PackageReference Include="MintPlayer.Mapper.Attributes" Version="6.2.0" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<!-- Put the assets for this project in the correct package path -->
-		<!-- Rolsyn 4.0 + Rolsyn 4.9 -->
-		<None Include="$(PkgMintPlayer_Mapper_Attributes)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
-	</ItemGroup>
-
-	<PropertyGroup>
-		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsMapper</GetTargetPathDependsOn>
-	</PropertyGroup>
-
-	<Target Name="GetDependencyTargetPathsMapper">
-		<!-- Include dependency DLLs and put them in the correct package path -->
-		<ItemGroup>
-			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_Mapper_Attributes)\lib\netstandard2.0\MintPlayer.Mapper.Attributes.dll" IncludeRuntimeDependency="true" />
-		</ItemGroup>
-	</Target>
-</Project>
diff --git a/SourceGenerators/MintPlayer.SourceGenerators.Targets/newtonsoftjson.targets b/SourceGenerators/MintPlayer.SourceGenerators.Targets/newtonsoftjson.targets
index cc0feffc..d66de7cb 100644
--- a/SourceGenerators/MintPlayer.SourceGenerators.Targets/newtonsoftjson.targets
+++ b/SourceGenerators/MintPlayer.SourceGenerators.Targets/newtonsoftjson.targets
@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
-		<PackageReference Include="Newtonsoft.Json" PrivateAssets="all" GeneratePathProperty="true" />
-		<PackageReference Include="MintPlayer.ValueComparers.NewtonsoftJson" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
-		<PackageReference Include="Newtonsoft.Json" Version="13.0.3" PrivateAssets="all" GeneratePathProperty="true" />
-		<PackageReference Include="MintPlayer.ValueComparers.NewtonsoftJson" Version="5.3.0" PrivateAssets="all" GeneratePathProperty="true" />
-	</ItemGroup>
-
 	<PropertyGroup>
 		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsNewtonsoftJson</GetTargetPathDependsOn>
 	</PropertyGroup>
@@ -32,4 +22,11 @@
 			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_ValueComparers_NewtonsoftJson)\lib\netstandard2.0\MintPlayer.ValueComparers.NewtonsoftJson.dll" IncludeRuntimeDependency="false" />
 		</ItemGroup>
 	</Target>
+
+	<Target Name="MintPlayer_NewtonsoftJson_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
+		<Error Condition="'$(PkgNewtonsoft_Json)' == ''"
+			   Text="Please add GeneratePathProperty=&quot;true&quot; on the Newtonsoft.Json PackageReference." />
+		<Error Condition="'$(PkgMintPlayer_ValueComparers_NewtonsoftJson)' == ''"
+			   Text="Please add GeneratePathProperty=&quot;true&quot; on the MintPlayer.ValueComparers.NewtonsoftJson PackageReference." />
+	</Target>
 </Project>
\ No newline at end of file
diff --git a/SourceGenerators/MintPlayer.SourceGenerators.Targets/sourcegenerator.targets b/SourceGenerators/MintPlayer.SourceGenerators.Targets/sourcegenerator.targets
deleted file mode 100644
index cc309d0b..00000000
--- a/SourceGenerators/MintPlayer.SourceGenerators.Targets/sourcegenerator.targets
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<PropertyGroup>
-		<DevelopmentDependency>true</DevelopmentDependency>
-		<IncludeBuildOutput>false</IncludeBuildOutput>
-		<IsRoslynComponent>true</IsRoslynComponent>
-		<EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-		<RoslynVersion></RoslynVersion>
-	</PropertyGroup>
-
-	<Choose>
-		<When Condition="$(RoslynVersion) == 'roslyn4.0'">
-			<ItemGroup>
-				<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-				<!--<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.0.1" PrivateAssets="all" />-->
-			</ItemGroup>
-			<PropertyGroup>
-				<DefineConstants>$(DefineConstants);ROSLYN_4_0;ROSLYN_4_0_OR_GREATER</DefineConstants>
-			</PropertyGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup>
-				<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-				<!--<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.9.2" PrivateAssets="all" />-->
-			</ItemGroup>
-			<PropertyGroup>
-				<DefineConstants>$(DefineConstants);ROSLYN_4_9;ROSLYN_4_0_OR_GREATER;ROSLYN_4_9_OR_GREATER</DefineConstants>
-			</PropertyGroup>
-		</Otherwise>
-	</Choose>
-	<ItemGroup>
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
-		<PackageReference Include="MintPlayer.SourceGenerators.Tools" PrivateAssets="all" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
-		<PackageReference Include="MintPlayer.SourceGenerators.Tools" Version="5.5.0" PrivateAssets="all" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<PropertyGroup>
-		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsCommon</GetTargetPathDependsOn>
-	</PropertyGroup>
-
-	<ItemGroup>
-		<!-- Put the assets for this project in the correct package path -->
-		<!-- Rolsyn 4.0 -->
-		<None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="true" />
-		<None Include="$(PkgMintPlayer_SourceGenerators_Tools)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="true" />
-
-		<!-- Rolsyn 4.9 -->
-		<None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.9/cs" Visible="true" />
-		<None Include="$(PkgMintPlayer_SourceGenerators_Tools)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.9/cs" Visible="true" />
-	</ItemGroup>
-
-	<Target Name="GetDependencyTargetPathsCommon">
-		<!-- Include dependency DLLs and put them in the correct package path -->
-		<ItemGroup>
-			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_SourceGenerators_Tools)\lib\netstandard2.0\MintPlayer.SourceGenerators.Tools.dll" IncludeRuntimeDependency="false" />
-		</ItemGroup>
-	</Target>
-	
-</Project>
\ No newline at end of file
diff --git a/SourceGenerators/MintPlayer.SourceGenerators.Targets/valuecomparergenerator.targets b/SourceGenerators/MintPlayer.SourceGenerators.Targets/valuecomparergenerator.targets
deleted file mode 100644
index 5ec16d48..00000000
--- a/SourceGenerators/MintPlayer.SourceGenerators.Targets/valuecomparergenerator.targets
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' == 'true' ">
-		<PackageReference Include="MintPlayer.ValueComparerGenerator" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" GeneratePathProperty="true" />
-		<PackageReference Include="MintPlayer.ValueComparerGenerator.Attributes" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup Condition=" '$(ManagePackageVersionsCentrally)' != 'true' ">
-		<PackageReference Include="MintPlayer.ValueComparerGenerator" Version="5.8.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" GeneratePathProperty="true" />
-		<PackageReference Include="MintPlayer.ValueComparerGenerator.Attributes" Version="5.2.0" GeneratePathProperty="true" />
-	</ItemGroup>
-
-	<ItemGroup>
-		<!-- Put the assets for this project in the correct package path -->
-		<!-- Rolsyn 4.0 + Rolsyn 4.9 -->
-		<None Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
-	</ItemGroup>
-
-	<PropertyGroup>
-		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsValuecomparer</GetTargetPathDependsOn>
-	</PropertyGroup>
-
-	<Target Name="GetDependencyTargetPathsValuecomparer">
-		<!-- Include dependency DLLs and put them in the correct package path -->
-		<ItemGroup>
-			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\MintPlayer.ValueComparerGenerator.Attributes.dll" IncludeRuntimeDependency="true" />
-		</ItemGroup>
-	</Target>
-</Project>
\ No newline at end of file
diff --git a/SourceGenerators/MintPlayer.SourceGenerators.Tools/Targets/sourcegenerator_tools.targets b/SourceGenerators/MintPlayer.SourceGenerators.Tools/Targets/sourcegenerator_tools.targets
index 658ade95..ba193fd5 100644
--- a/SourceGenerators/MintPlayer.SourceGenerators.Tools/Targets/sourcegenerator_tools.targets
+++ b/SourceGenerators/MintPlayer.SourceGenerators.Tools/Targets/sourcegenerator_tools.targets
@@ -13,9 +13,12 @@
 
 	<Target Name="GetDependencyTargetPathsCommon">
 		<!-- Include dependency DLLs and put them in the correct package path -->
-		<ItemGroup>
+		<ItemGroup Condition="'$(PkgMintPlayer_SourceGenerators_Tools)' != ''">
 			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_SourceGenerators_Tools)\lib\netstandard2.0\MintPlayer.SourceGenerators.Tools.dll" IncludeRuntimeDependency="false" />
 		</ItemGroup>
+		<ItemGroup Condition="'$(PkgMintPlayer_SourceGenerators_Tools)' == '' and Exists('$(MSBuildThisFileDirectory)..\MintPlayer.SourceGenerators.Tools')">
+			<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)..\MintPlayer.SourceGenerators.Tools\bin\$(Configuration)\netstandard2.0\MintPlayer.SourceGenerators.Tools.dll" IncludeRuntimeDependency="false" />
+		</ItemGroup>
 	</Target>
 
 	<Target Name="MapperGenerator_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
diff --git a/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj
index 1db23dfd..959ee8c5 100644
--- a/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj
+++ b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/MintPlayer.ValueComparerGenerator.csproj
@@ -25,10 +25,14 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<!-- FSR attribute assemblies should not be with a roslyn version path -->
-		<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
+		<None Include="Targets\valuecomparergenerator.props" Pack="true" PackagePath="build/$(PackageId).props" />
+		<None Include="Targets\valuecomparergenerator.targets" Pack="true" PackagePath="build/$(PackageId).targets" />
 	</ItemGroup>
 
+	<!--<ItemGroup>
+		<None Condition="'$(Configuration)' == 'Release' " Include="..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
+	</ItemGroup>-->
+
 	<ItemGroup>
 		<ProjectReference Include="..\MintPlayer.ValueComparerGenerator.Attributes\MintPlayer.ValueComparerGenerator.Attributes.csproj" />
 	</ItemGroup>
diff --git a/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.props b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.props
new file mode 100644
index 00000000..9cb5f05f
--- /dev/null
+++ b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.props
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<ItemGroup>
+		<!-- Put the assets for this project in the correct package path -->
+		<!-- Rolsyn 4.0 + Rolsyn 4.9 -->
+		<None Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="true" />
+	</ItemGroup>
+
+</Project>
\ No newline at end of file
diff --git a/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.targets b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.targets
new file mode 100644
index 00000000..dd250c78
--- /dev/null
+++ b/SourceGenerators/ValueComparerGenerator/MintPlayer.ValueComparerGenerator/Targets/valuecomparergenerator.targets
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+
+	<PropertyGroup>
+		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsValueComparer</GetTargetPathDependsOn>
+	</PropertyGroup>
+
+	<Target Name="GetDependencyTargetPathsValueComparer">
+		<!-- Include dependency DLLs and put them in the correct package path -->
+		<ItemGroup Condition="'$(PkgMintPlayer_ValueComparerGenerator_Attributes)' != ''">
+			<TargetPathWithTargetPlatformMoniker Include="$(PkgMintPlayer_ValueComparerGenerator_Attributes)\lib\netstandard2.0\MintPlayer.ValueComparerGenerator.Attributes.dll" IncludeRuntimeDependency="true" />
+		</ItemGroup>
+		<ItemGroup Condition="'$(PkgMintPlayer_ValueComparerGenerator_Attributes)' == '' and Exists('$(MSBuildThisFileDirectory)..\MintPlayer.ValueComparerGenerator.Attributes')">
+			<TargetPathWithTargetPlatformMoniker Include="$(MSBuildThisFileDirectory)..\MintPlayer.ValueComparerGenerator.Attributes\bin\$(Configuration)\netstandard2.0\MintPlayer.ValueComparerGenerator.Attributes.dll" IncludeRuntimeDependency="true" />
+		</ItemGroup>
+	</Target>
+
+	<Target Name="ValueComparerGenerator_CheckGeneratePathProperty" BeforeTargets="CoreCompile" Condition="'$(DesignTimeBuild)' != 'true'">
+		<Error Condition="'$(PkgMintPlayer_ValueComparerGenerator_Attributes)' == ''"
+			   Text="Please add GeneratePathProperty=&quot;true&quot; on the MintPlayer.ValueComparerGenerator.Attributes PackageReference." />
+	</Target>
+</Project>
\ No newline at end of file
diff --git a/SourceGenerators/eng/sourcegenerator.targets b/SourceGenerators/eng/sourcegenerator.targets
index 8b161464..72f97eef 100644
--- a/SourceGenerators/eng/sourcegenerator.targets
+++ b/SourceGenerators/eng/sourcegenerator.targets
@@ -13,33 +13,6 @@
 		<RoslynVersion></RoslynVersion>
 	</PropertyGroup>
 
-	<Choose>
-		<When Condition="$(RoslynVersion) == 'roslyn4.0'">
-			<ItemGroup>
-				<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-				<!--<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.0.1" PrivateAssets="all" />-->
-			</ItemGroup>
-			<PropertyGroup>
-				<DefineConstants>$(DefineConstants);ROSLYN_4_0;ROSLYN_4_0_OR_GREATER</DefineConstants>
-			</PropertyGroup>
-		</When>
-		<Otherwise>
-			<ItemGroup>
-				<PackageReference Include="Microsoft.CodeAnalysis" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.14.0" PrivateAssets="all" />
-				<PackageReference Include="Microsoft.CodeAnalysis.Analyzers" Version="3.11.0" PrivateAssets="all" IncludeAssets="runtime; build; native; contentfiles; analyzers; buildtransitive" />
-				<!--<PackageReference Include="Microsoft.CodeAnalysis.Features" Version="4.9.2" PrivateAssets="all" />-->
-			</ItemGroup>
-			<PropertyGroup>
-				<DefineConstants>$(DefineConstants);ROSLYN_4_9;ROSLYN_4_0_OR_GREATER;ROSLYN_4_9_OR_GREATER</DefineConstants>
-			</PropertyGroup>
-		</Otherwise>
-	</Choose>
-	<ItemGroup>
-	</ItemGroup>
-
 	<ItemGroup>
 		<ProjectReference Include="$(MSBuildThisFileDirectory)\..\MintPlayer.SourceGenerators.Tools\MintPlayer.SourceGenerators.Tools.csproj" PrivateAssets="all" />
 	</ItemGroup>
@@ -48,17 +21,6 @@
 		<GetTargetPathDependsOn>$(GetTargetPathDependsOn);GetDependencyTargetPathsCommon</GetTargetPathDependsOn>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<!-- Put the assets for this project in the correct package path -->
-		<!-- Rolsyn 4.0 -->
-		<None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="false" />
-		<None Condition="'$(Configuration)' == 'Release' " Include="$(MSBuildThisFileDirectory)\..\MintPlayer.SourceGenerators.Tools\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.0/cs" Visible="false" />
-
-		<!-- Rolsyn 4.9 -->
-		<None Include="$(MSBuildProjectDirectory)\bin\$(Configuration)\netstandard2.0\$(AssemblyName).dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.9/cs" Visible="false" />
-		<None Condition="'$(Configuration)' == 'Release' " Include="$(MSBuildThisFileDirectory)\..\MintPlayer.SourceGenerators.Tools\bin\$(Configuration)\netstandard2.0\*.dll" Pack="true" PackagePath="analyzers/dotnet/roslyn4.9/cs" Visible="false" />
-	</ItemGroup>
-
 	<Target Name="GetDependencyTargetPathsCommon">
 		<!-- Include dependency DLLs and put them in the correct package path -->
 		<ItemGroup>