diff --git a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets b/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
index 3786fd6a2bd..5524494dfae 100644
--- a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
+++ b/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
@@ -3010,6 +3010,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
       _GenerateCompileInputs;
       BeforeCompile;
       _TimeStampBeforeCompile;
+      _GenerateCompilerDependencyCache;
       CoreCompile;
       _TimeStampAfterCompile;
       AfterCompile;
@@ -3164,6 +3165,31 @@ Copyright (C) Microsoft Corporation. All rights reserved.
 
   </Target>
 
+  <!--
+    ============================================================
+                                        _GenerateCompilerDependencyCache
+
+    Generate a file used to track compiler dependencies between incremental build
+    executions. This handles cases where items are added or removed from a glob (e.g.
+    <Compile Include="**\*.cs" />) and can't otherwise be detected with timestamp 
+    comparisons. The file contains a hash of compiler inputs that are known to 
+    contribute to incremental build inconsistencies.
+    ============================================================
+    -->
+  <Target Name="_GenerateCompilerDependencyCache" DependsOnTargets="ResolveAssemblyReferences">
+    <ItemGroup>
+      <CustomAdditionalCompileInputs Include="$(IntermediateOutputPath)CoreCompileInputs.cache" />
+      <CoreCompileCache Include="@(Compile->'%(FullPath)')" />
+      <CoreCompileCache Include="@(ReferencePath->'%(FullPath)')" />
+    </ItemGroup>
+
+    <Hash ItemsToHash="@(CoreCompileCache)">
+      <Output TaskParameter="HashResult" PropertyName="CoreCompileDependencyHash" />
+    </Hash>
+
+    <WriteLinesToFile Lines="$(CoreCompileDependencyHash)" File="$(IntermediateOutputPath)CoreCompileInputs.cache" Overwrite="True" WriteOnlyWhenDifferent="True" />
+  </Target>
+
   <!--
     ============================================================
                                         _TimeStampAfterCompile