From b04c4b52668ec096e018eb94d5987e5fd8a6cc7d Mon Sep 17 00:00:00 2001
From: Virgile Bello <virgile@xenko.com>
Date: Tue, 2 Oct 2018 10:55:40 +0900
Subject: [PATCH] [Build] Fixed FastUpToDateCheck with Xenko.Native for faster
 iteration when nothing changed

---
 sources/engine/Xenko.Native/Xenko.Native.csproj              | 1 -
 sources/engine/Xenko.Navigation/Xenko.Navigation.csproj      | 1 -
 .../engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj  | 1 -
 sources/native/Xenko.Native.targets                          | 5 +++++
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/sources/engine/Xenko.Native/Xenko.Native.csproj b/sources/engine/Xenko.Native/Xenko.Native.csproj
index 3b6aa015ee..6e03b04d35 100644
--- a/sources/engine/Xenko.Native/Xenko.Native.csproj
+++ b/sources/engine/Xenko.Native/Xenko.Native.csproj
@@ -14,7 +14,6 @@
     <TargetFramework>$(TargetFramework)</TargetFramework>
     <XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="..\..\shared\SharedAssemblyInfo.cs">
diff --git a/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj b/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj
index 71b41c3e57..491ce07bba 100644
--- a/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj
+++ b/sources/engine/Xenko.Navigation/Xenko.Navigation.csproj
@@ -14,7 +14,6 @@
     <TargetFramework>$(TargetFramework)</TargetFramework>
     <XenkoAssemblyProcessorOptions>--serialization</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
 
diff --git a/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj b/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj
index e2d5cef2bf..4c3d7a19c4 100644
--- a/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj
+++ b/sources/engine/Xenko.VirtualReality/Xenko.VirtualReality.csproj
@@ -14,7 +14,6 @@
     <TargetFramework>$(TargetFramework)</TargetFramework>
     <XenkoAssemblyProcessorOptions>--serialization --parameter-key</XenkoAssemblyProcessorOptions>
     <XenkoBuildTags>*</XenkoBuildTags>
-    <DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
     <XenkoCodeAnalysis>true</XenkoCodeAnalysis>
   </PropertyGroup>
   <Choose>
diff --git a/sources/native/Xenko.Native.targets b/sources/native/Xenko.Native.targets
index ee9b383618..c166a8dabe 100644
--- a/sources/native/Xenko.Native.targets
+++ b/sources/native/Xenko.Native.targets
@@ -80,6 +80,7 @@
   <ItemGroup>
     <UpToDateCheckInput Include="@(XenkoNativeCFile)" />
     <UpToDateCheckInput Include="@(XenkoNativeHFile)" />
+    <UpToDateCheckOutput Include="@(XenkoNativeOutput)" />
   </ItemGroup>
   
   <!-- Update XenkoNativeOutput.Link using computed OutputPath and add to XenkoNativeLib -->
@@ -93,6 +94,10 @@
       </XenkoNativeOutput>
       <XenkoNativeLib Include="@(XenkoNativeOutput)"/>
     </ItemGroup>
+
+    <!-- This is necessary for UpToDateCheck: CompileNativeClang is checking only XenkoNativeOutput against native sources
+         but FastUpToDateCheck check XenkoNativeOutput against various other unrelated files such as C# sources, so we want to mark the file as modified after, even if CompileNativeClang was skipped -->
+    <Touch Files="@(XenkoNativeOutput)" />
   </Target>
 
   <!-- Define ItemGroup so that they are properly copied -->