From f3048eece533870d04bf6dd3a135369db8a68329 Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Fri, 21 Aug 2020 18:10:32 +0200
Subject: [PATCH] [msbuild] Share three stub targets for Windows between
 Xamarin.iOS and Xamarin.Mac. (#9443)

These only apply to Xamarin.iOS right now, since they're Windows-specific (and
we don't support Xamarin.Mac binding projects on Windows), but if we ever do
end up supporting binding projects for Xamarin.Mac on Windows, we'll need
these targets there, so just make them shared code.
---
 .../Xamarin.Shared.Stubs.targets}                               | 2 +-
 msbuild/Xamarin.Shared/Xamarin.Shared.targets                   | 2 ++
 msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets       | 2 --
 .../Xamarin.iOS.ObjCBinding.Common.targets                      | 2 --
 4 files changed, 3 insertions(+), 5 deletions(-)
 rename msbuild/{Xamarin.iOS.Tasks.Core/Xamarin.iOS.NativeReference.Stubs.targets => Xamarin.Shared/Xamarin.Shared.Stubs.targets} (97%)

diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.NativeReference.Stubs.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.Stubs.targets
similarity index 97%
rename from msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.NativeReference.Stubs.targets
rename to msbuild/Xamarin.Shared/Xamarin.Shared.Stubs.targets
index a3b1a9fec6..5f091797df 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.NativeReference.Stubs.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.Stubs.targets
@@ -1,6 +1,6 @@
 <!--
 ***********************************************************************************************
-Xamarin.iOS.NativeReference.Stubs.targets
+Xamarin.Shared.Stubs.targets
 
 WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
   created a backup copy.  Incorrect changes to this file will make it
diff --git a/msbuild/Xamarin.Shared/Xamarin.Shared.targets b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
index 5eb6b132c6..455bd117f9 100644
--- a/msbuild/Xamarin.Shared/Xamarin.Shared.targets
+++ b/msbuild/Xamarin.Shared/Xamarin.Shared.targets
@@ -614,6 +614,8 @@ Copyright (C) 2018 Microsoft. All rights reserved.
 	<!-- Xamarin.ImplicitFacade.targets will detect if we need to add an implicit reference to netstandard.dll -->
 	<Import Project="$(MSBuildThisFileDirectory)Xamarin.ImplicitFacade.targets" Condition="!('$(_PlatformName)' == 'macOS' And '$(TargetFrameworkName)' == 'System')"/>
 
+	<Import Project="$(MSBuildThisFileDirectory)Xamarin.Shared.Stubs.targets" />
+
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
 </Project>
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
index 4a56926503..35aeecdc52 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.Common.targets
@@ -1951,8 +1951,6 @@ Copyright (C) 2013-2016 Xamarin. All rights reserved.
 		</Archive>
 	</Target>
 
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.NativeReference.Stubs.targets" />
-
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
 
diff --git a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets
index 58da028fac..33b8eaffc6 100644
--- a/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets
+++ b/msbuild/Xamarin.iOS.Tasks.Core/Xamarin.iOS.ObjCBinding.Common.targets
@@ -20,8 +20,6 @@ Copyright (C) 2013-2016 Xamarin Inc. All rights reserved.
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets" 
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).Before.targets')"/>
 
-	<Import Project="$(MSBuildThisFileDirectory)Xamarin.iOS.NativeReference.Stubs.targets" />
-
 	<Import Project="$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets"
 			Condition="Exists('$(MSBuildThisFileDirectory)$(MSBuildThisFileName).After.targets')"/>
 </Project>