From 2a203b53bb8529c795f24fd6b5a4ce980b0b9bfc Mon Sep 17 00:00:00 2001
From: Rolf Bjarne Kvinge <rolf@xamarin.com>
Date: Wed, 23 Jun 2021 09:31:53 +0200
Subject: [PATCH] [msbuild] Compute input files slightly differently for
 CreateMergedAppBundle.

So that MSBuild doesn't execute CreateMergedAppBundle twice, each time with a
different input.
---
 dotnet/targets/Xamarin.Shared.Sdk.targets | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dotnet/targets/Xamarin.Shared.Sdk.targets b/dotnet/targets/Xamarin.Shared.Sdk.targets
index 084d499e82..1a1e602e7f 100644
--- a/dotnet/targets/Xamarin.Shared.Sdk.targets
+++ b/dotnet/targets/Xamarin.Shared.Sdk.targets
@@ -286,11 +286,12 @@
 			<_AssemblyPublishDirectories>
 				<SpecificSubDirectory>.xamarin/%(RuntimeIdentifier)</SpecificSubDirectory>
 			</_AssemblyPublishDirectories>
+			<_AssemblyPublishInputs Include="@(_AssemblyPublishDirectories -> '%(Identity)/**')" />
 		</ItemGroup>
 	</Target>
 
 	<Target Name="_CreateMergedAppBundle"
-		Inputs="@(_AssemblyPublishDirectories -> %(_AssemblyPublishDirectories.Identity)/**)"
+		Inputs="@(_AssemblyPublishInputs)"
 		Outputs="$(DeviceSpecificIntermediateOutputPath)$(_AppBundleName).mergestamp"
 		DependsOnTargets="_RunRidSpecificBuild"
 		>