From 38dfebe42cd189204b19a89e644b501826871fee Mon Sep 17 00:00:00 2001
From: Matthew Leibowitz <mattleibow@live.com>
Date: Tue, 16 Nov 2021 00:48:21 +0200
Subject: [PATCH] Fix the Mac Catalyst build task Inputs/Outputs

---
 .../nuget/build/maccatalyst/HarfBuzzSharp.Local.targets        | 3 ++-
 .../nuget/build/maccatalyst/HarfBuzzSharp.targets              | 3 ++-
 .../SkiaSharp/nuget/build/maccatalyst/SkiaSharp.Local.targets  | 3 ++-
 binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.targets    | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.Local.targets b/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.Local.targets
index 29ee32ba8bd..34a5dbb15ba 100644
--- a/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.Local.targets
+++ b/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.Local.targets
@@ -6,7 +6,8 @@
         <_HarfBuzzSharpExpandNativeReferencesPath>obj\$(Configuration)\$(TargetFramework)\harfbuzzsharpextract\</_HarfBuzzSharpExpandNativeReferencesPath>
     </PropertyGroup>
 
-    <Target Name="_HarfBuzzSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' and !Exists('$(_HarfBuzzSharpExpandNativeReferencesStamp)') ">
+    <Target Name="_HarfBuzzSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' "
+            Inputs="$(MSBuildThisFileFullPath)" Outputs="$(_HarfBuzzSharpExpandNativeReferencesStamp)">
 
         <RemoveDir Directories="$(_HarfBuzzSharpExpandNativeReferencesPath)" />
         <MakeDir Directories="$(_HarfBuzzSharpExpandNativeReferencesPath)" />
diff --git a/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.targets
index 8cc25244dc8..cf0a095962b 100644
--- a/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.targets
+++ b/binding/HarfBuzzSharp/nuget/build/maccatalyst/HarfBuzzSharp.targets
@@ -7,7 +7,8 @@
     </PropertyGroup>
 
     <!-- temporarily work around https://github.com/xamarin/xamarin-macios/issues/11667 -->
-    <Target Name="_HarfBuzzSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' and !Exists('$(_HarfBuzzSharpExpandNativeReferencesStamp)') ">
+    <Target Name="_HarfBuzzSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' "
+            Inputs="$(MSBuildThisFileFullPath)" Outputs="$(_HarfBuzzSharpExpandNativeReferencesStamp)">
 
         <ItemGroup>
             <_HarfBuzzSharpPossibleNativeFramework
diff --git a/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.Local.targets b/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.Local.targets
index bb8d5758dfe..f6e9534e8ad 100644
--- a/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.Local.targets
+++ b/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.Local.targets
@@ -6,7 +6,8 @@
         <_SkiaSharpExpandNativeReferencesPath>obj\$(Configuration)\$(TargetFramework)\skiasharpextract\</_SkiaSharpExpandNativeReferencesPath>
     </PropertyGroup>
 
-    <Target Name="_SkiaSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' and !Exists('$(_SkiaSharpExpandNativeReferencesStamp)') ">
+    <Target Name="_SkiaSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' "
+            Inputs="$(MSBuildThisFileFullPath)" Outputs="$(_SkiaSharpExpandNativeReferencesStamp)">
 
         <RemoveDir Directories="$(_SkiaSharpExpandNativeReferencesPath)" />
         <MakeDir Directories="$(_SkiaSharpExpandNativeReferencesPath)" />
diff --git a/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.targets
index 7356fd2a267..7196571dc53 100644
--- a/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.targets
+++ b/binding/SkiaSharp/nuget/build/maccatalyst/SkiaSharp.targets
@@ -7,7 +7,8 @@
     </PropertyGroup>
 
     <!-- temporarily work around https://github.com/xamarin/xamarin-macios/issues/11667 -->
-    <Target Name="_SkiaSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' and !Exists('$(_SkiaSharpExpandNativeReferencesStamp)') ">
+    <Target Name="_SkiaSharpExpandNativeReferencesFixes" BeforeTargets="_ExpandNativeReferences" Condition=" '$(OS)' == 'Unix' "
+            Inputs="$(MSBuildThisFileFullPath)" Outputs="$(_SkiaSharpExpandNativeReferencesStamp)">
 
         <ItemGroup>
             <_SkiaSharpPossibleNativeFramework