diff --git a/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.props b/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.props
index ce9eb5bc..3d62326f 100644
--- a/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.props
+++ b/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.props
@@ -1,9 +1,5 @@
 <Project>
 
-  <PropertyGroup>
-    <MSBuildShortVersion>$(MSBuildVersion.TrimEnd('0123456789').TrimEnd('.'))</MSBuildShortVersion>
-  </PropertyGroup>
-
   <ItemGroup>
     <CompilerVisibleProperty Include="DebugSourceGenerators" />
   </ItemGroup>
diff --git a/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.targets b/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.targets
index 3a0ae3de..7fec01b8 100644
--- a/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.targets
+++ b/src/ThisAssembly.Prerequisites/ThisAssembly.Prerequisites.targets
@@ -1,8 +1,10 @@
 <Project>
 
   <Target Name="EnsureSourceGenerators" BeforeTargets="BeforeCompile;CoreCompile">
+
     <Error Text="ThisAssembly requires MSBuild 16.8+ or .NET SDK 5.0+."
-           Condition="$(MSBuildShortVersion) &lt; '16.8'" />
+            Condition="$([System.Version]::Parse('16.8.0').CompareTo($([System.Version]::Parse($(MSBuildVersion))))) == 1" />
+
     <!-- See https://docs.microsoft.com/en-us/dotnet/csharp/language-reference/compiler-options/langversion-compiler-option -->
     <Error Text="ThisAssembly uses Roslyn source generators, which are only supported in C# 9.0 or greater at the moment."
            Condition="'$(Language)' != 'C#' OR