diff --git a/Directory.Build.targets b/Directory.Build.targets
index f2c71b74a0e..3c3e5820070 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -38,4 +38,12 @@
                Condition="Exists('$(_PackageFolderInGlobalPackages)')" />
   </Target>
 
+  <!-- Make APICompat use roslyn from the toolset SDK instead of from the toolset package. This avoids unification issues on desktop msbuild.
+       TODO: Remove when a 8.0.200 or 9.0 SDK is consumed. -->
+  <Target Name="FixAPICompatWorkAroundRoslynMove" AfterTargets="CollectApiCompatInputs">
+    <PropertyGroup>
+      <RoslynAssembliesPath>$(RoslynTargetsPath)</RoslynAssembliesPath>
+    </PropertyGroup>
+  </Target>
+
 </Project>