diff --git a/Analyzer.props b/Analyzer.props
deleted file mode 100644
index ba04867b64..0000000000
--- a/Analyzer.props
+++ /dev/null
@@ -1,10 +0,0 @@
-<Project>
-
-    <Import Project="$(MSBuildThisFileDirectory)Roslyn.props" />
-
-    <ItemGroup>
-        <Compile Include="..\TUnit.Analyzers\**\*.cs" Exclude="..\TUnit.Analyzers\obj\**\*.cs" />
-        <EmbeddedResource Include="..\TUnit.Analyzers\**\*.resx" />
-    </ItemGroup>
-
-</Project>
diff --git a/AspNetCore.Analyzer.props b/AspNetCore.Analyzer.props
deleted file mode 100644
index 5036184620..0000000000
--- a/AspNetCore.Analyzer.props
+++ /dev/null
@@ -1,12 +0,0 @@
-<Project>
-
-    <Import Project="$(MSBuildThisFileDirectory)Roslyn.props" />
-
-    <ItemGroup>
-        <Compile Include="..\TUnit.AspNetCore.Analyzers\**\*.cs" Exclude="..\TUnit.AspNetCore.Analyzers\obj\**\*.cs" />
-        <EmbeddedResource Include="..\TUnit.AspNetCore.Analyzers\**\*.resx" />
-        <AdditionalFiles Include="..\TUnit.AspNetCore.Analyzers\AnalyzerReleases.Shipped.md" />
-        <AdditionalFiles Include="..\TUnit.AspNetCore.Analyzers\AnalyzerReleases.Unshipped.md" />
-    </ItemGroup>
-
-</Project>
diff --git a/Directory.Build.props b/Directory.Build.props
index 174a023dc6..88c3d58f78 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -23,24 +23,14 @@
     <BuildPath>build/netstandard2.0</BuildPath>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(MSBuildProjectName.StartsWith('TUnit.Analyzers.Roslyn'))">
+  <!-- Shared properties for all Roslyn-versioned variant projects (e.g. TUnit.Analyzers.Roslyn44) -->
+  <PropertyGroup Condition="$(MSBuildProjectName.Contains('.Roslyn'))">
+    <_BaseProjectName>$([System.Text.RegularExpressions.Regex]::Replace($(MSBuildProjectName), '\.Roslyn\d+$', ''))</_BaseProjectName>
+    <_RoslynDigits>$([System.Text.RegularExpressions.Regex]::Match($(MSBuildProjectName), 'Roslyn(\d+)$').Groups[1].Value)</_RoslynDigits>
+    <RoslynVersion>$([System.Text.RegularExpressions.Regex]::Replace($(_RoslynDigits), '^(\d)', '$1.'))</RoslynVersion>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyName>TUnit.Analyzers</AssemblyName>
-    <RootNamespace>TUnit.Analyzers</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(MSBuildProjectName.StartsWith('TUnit.Core.SourceGenerator.Roslyn'))">
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyName>TUnit.Core.SourceGenerator</AssemblyName>
-    <RootNamespace>TUnit.Core.SourceGenerator</RootNamespace>
-    <IsPackable>false</IsPackable>
-    <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
-  </PropertyGroup>
-  <PropertyGroup Condition="$(MSBuildProjectName.StartsWith('TUnit.AspNetCore.Analyzers.Roslyn'))">
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-    <AssemblyName>TUnit.AspNetCore.Analyzers</AssemblyName>
-    <RootNamespace>TUnit.AspNetCore.Analyzers</RootNamespace>
+    <AssemblyName>$(_BaseProjectName)</AssemblyName>
+    <RootNamespace>$(_BaseProjectName)</RootNamespace>
     <IsPackable>false</IsPackable>
     <EnforceExtendedAnalyzerRules>true</EnforceExtendedAnalyzerRules>
   </PropertyGroup>
diff --git a/Roslyn.props b/Roslyn.props
index 9a3940c423..356432b6ba 100644
--- a/Roslyn.props
+++ b/Roslyn.props
@@ -6,4 +6,27 @@
         <PackageReference Include="Microsoft.CodeAnalysis.CSharp" VersionOverride="$(RoslynVersion).*"/>
     </ItemGroup>
 
+    <!-- Link source files from the base project (e.g. ..\TUnit.Analyzers\**\*.cs) -->
+    <ItemGroup Condition="'$(_BaseProjectName)' != ''">
+        <Compile Include="..\$(_BaseProjectName)\**\*.cs" Exclude="..\$(_BaseProjectName)\obj\**\*.cs" />
+    </ItemGroup>
+
+    <!-- Analyzer projects: include .resx embedded resources -->
+    <ItemGroup Condition="$(_BaseProjectName.EndsWith('.Analyzers'))">
+        <EmbeddedResource Include="..\$(_BaseProjectName)\**\*.resx" />
+    </ItemGroup>
+
+    <!-- AspNetCore.Analyzers: include analyzer release tracking files -->
+    <ItemGroup Condition="$(_BaseProjectName.Contains('AspNetCore.Analyzers'))">
+        <AdditionalFiles Include="..\$(_BaseProjectName)\AnalyzerReleases.Shipped.md" />
+        <AdditionalFiles Include="..\$(_BaseProjectName)\AnalyzerReleases.Unshipped.md" />
+    </ItemGroup>
+
+    <!-- SourceGenerator: include folder link for IDE navigation -->
+    <ItemGroup Condition="$(_BaseProjectName.Contains('SourceGenerator'))">
+        <Folder Include="..\$(_BaseProjectName)\CodeGenerators\Writers\Hooks\">
+            <Link>CodeGenerators\Writers\Hooks</Link>
+        </Folder>
+    </ItemGroup>
+
 </Project>
diff --git a/SourceGenerator.props b/SourceGenerator.props
deleted file mode 100644
index a5b1600416..0000000000
--- a/SourceGenerator.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-    
-    <Import Project="$(MSBuildThisFileDirectory)Roslyn.props" />
-
-    <ItemGroup>
-        <Compile Include="..\TUnit.Core.SourceGenerator\**\*.cs" Exclude="..\TUnit.Core.SourceGenerator\obj\**\*.cs" />
-    </ItemGroup>
-
-</Project>
diff --git a/TUnit.Analyzers.Roslyn414/TUnit.Analyzers.Roslyn414.csproj b/TUnit.Analyzers.Roslyn414/TUnit.Analyzers.Roslyn414.csproj
index 88b8220fa7..241958b3ba 100644
--- a/TUnit.Analyzers.Roslyn414/TUnit.Analyzers.Roslyn414.csproj
+++ b/TUnit.Analyzers.Roslyn414/TUnit.Analyzers.Roslyn414.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.14</RoslynVersion>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\Analyzer.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\Roslyn.props" />
 
 </Project>
diff --git a/TUnit.Analyzers.Roslyn44/TUnit.Analyzers.Roslyn44.csproj b/TUnit.Analyzers.Roslyn44/TUnit.Analyzers.Roslyn44.csproj
index 9c5407b008..c9b05ccfa4 100644
--- a/TUnit.Analyzers.Roslyn44/TUnit.Analyzers.Roslyn44.csproj
+++ b/TUnit.Analyzers.Roslyn44/TUnit.Analyzers.Roslyn44.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.4</RoslynVersion>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\Analyzer.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\Roslyn.props" />
 
 </Project>
\ No newline at end of file
diff --git a/TUnit.Analyzers.Roslyn47/TUnit.Analyzers.Roslyn47.csproj b/TUnit.Analyzers.Roslyn47/TUnit.Analyzers.Roslyn47.csproj
index 883378ea5f..c9b05ccfa4 100644
--- a/TUnit.Analyzers.Roslyn47/TUnit.Analyzers.Roslyn47.csproj
+++ b/TUnit.Analyzers.Roslyn47/TUnit.Analyzers.Roslyn47.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.7</RoslynVersion>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\Analyzer.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\Roslyn.props" />
 
 </Project>
\ No newline at end of file
diff --git a/TUnit.AspNetCore.Analyzers.Roslyn414/TUnit.AspNetCore.Analyzers.Roslyn414.csproj b/TUnit.AspNetCore.Analyzers.Roslyn414/TUnit.AspNetCore.Analyzers.Roslyn414.csproj
index a37eda453b..73b4ec1b8c 100644
--- a/TUnit.AspNetCore.Analyzers.Roslyn414/TUnit.AspNetCore.Analyzers.Roslyn414.csproj
+++ b/TUnit.AspNetCore.Analyzers.Roslyn414/TUnit.AspNetCore.Analyzers.Roslyn414.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.14</RoslynVersion>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\AspNetCore.Analyzer.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\Roslyn.props" />
 
 </Project>
diff --git a/TUnit.AspNetCore.Analyzers.Roslyn44/TUnit.AspNetCore.Analyzers.Roslyn44.csproj b/TUnit.AspNetCore.Analyzers.Roslyn44/TUnit.AspNetCore.Analyzers.Roslyn44.csproj
index 5df2a50bec..73b4ec1b8c 100644
--- a/TUnit.AspNetCore.Analyzers.Roslyn44/TUnit.AspNetCore.Analyzers.Roslyn44.csproj
+++ b/TUnit.AspNetCore.Analyzers.Roslyn44/TUnit.AspNetCore.Analyzers.Roslyn44.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.4</RoslynVersion>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\AspNetCore.Analyzer.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\Roslyn.props" />
 
 </Project>
diff --git a/TUnit.AspNetCore.Analyzers.Roslyn47/TUnit.AspNetCore.Analyzers.Roslyn47.csproj b/TUnit.AspNetCore.Analyzers.Roslyn47/TUnit.AspNetCore.Analyzers.Roslyn47.csproj
index 5694a2f514..73b4ec1b8c 100644
--- a/TUnit.AspNetCore.Analyzers.Roslyn47/TUnit.AspNetCore.Analyzers.Roslyn47.csproj
+++ b/TUnit.AspNetCore.Analyzers.Roslyn47/TUnit.AspNetCore.Analyzers.Roslyn47.csproj
@@ -1,9 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.7</RoslynVersion>
-    </PropertyGroup>
-
-    <Import Project="$(MSBuildThisFileDirectory)..\AspNetCore.Analyzer.props" />
+    <Import Project="$(MSBuildThisFileDirectory)..\Roslyn.props" />
 
 </Project>
diff --git a/TUnit.Core.SourceGenerator.Roslyn414/TUnit.Core.SourceGenerator.Roslyn414.csproj b/TUnit.Core.SourceGenerator.Roslyn414/TUnit.Core.SourceGenerator.Roslyn414.csproj
index 9e5718edba..62ac127eef 100644
--- a/TUnit.Core.SourceGenerator.Roslyn414/TUnit.Core.SourceGenerator.Roslyn414.csproj
+++ b/TUnit.Core.SourceGenerator.Roslyn414/TUnit.Core.SourceGenerator.Roslyn414.csproj
@@ -1,15 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.14</RoslynVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Folder Include="..\TUnit.Core.SourceGenerator\CodeGenerators\Writers\Hooks\">
-        <Link>CodeGenerators\Writers\Hooks</Link>
-      </Folder>
-    </ItemGroup>
-
-    <Import Project="..\SourceGenerator.props" />
+    <Import Project="..\Roslyn.props" />
 
 </Project>
diff --git a/TUnit.Core.SourceGenerator.Roslyn44/TUnit.Core.SourceGenerator.Roslyn44.csproj b/TUnit.Core.SourceGenerator.Roslyn44/TUnit.Core.SourceGenerator.Roslyn44.csproj
index 109e28962a..62ac127eef 100644
--- a/TUnit.Core.SourceGenerator.Roslyn44/TUnit.Core.SourceGenerator.Roslyn44.csproj
+++ b/TUnit.Core.SourceGenerator.Roslyn44/TUnit.Core.SourceGenerator.Roslyn44.csproj
@@ -1,15 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.4</RoslynVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Folder Include="..\TUnit.Core.SourceGenerator\CodeGenerators\Writers\Hooks\">
-        <Link>CodeGenerators\Writers\Hooks</Link>
-      </Folder>
-    </ItemGroup>
-
-    <Import Project="..\SourceGenerator.props" />
+    <Import Project="..\Roslyn.props" />
 
 </Project>
diff --git a/TUnit.Core.SourceGenerator.Roslyn47/TUnit.Core.SourceGenerator.Roslyn47.csproj b/TUnit.Core.SourceGenerator.Roslyn47/TUnit.Core.SourceGenerator.Roslyn47.csproj
index c4571db44e..62ac127eef 100644
--- a/TUnit.Core.SourceGenerator.Roslyn47/TUnit.Core.SourceGenerator.Roslyn47.csproj
+++ b/TUnit.Core.SourceGenerator.Roslyn47/TUnit.Core.SourceGenerator.Roslyn47.csproj
@@ -1,15 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <RoslynVersion>4.7</RoslynVersion>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <Folder Include="..\TUnit.Core.SourceGenerator\CodeGenerators\Writers\Hooks\">
-        <Link>CodeGenerators\Writers\Hooks</Link>
-      </Folder>
-    </ItemGroup>
-
-    <Import Project="..\SourceGenerator.props" />
+    <Import Project="..\Roslyn.props" />
 
 </Project>