From 88f9e4b5e95c0d2b7b7ac12fb721675a851fcd5d Mon Sep 17 00:00:00 2001
From: Daniel Cazzulino <daniel@cazzulino.com>
Date: Mon, 29 Apr 2019 14:33:47 -0300
Subject: [PATCH] Add package content in multitargeting GetPackageContents

When project-level targets need access to the content, they should be able to
rely on the same item group generated for non-multitargeting runs.
---
 .../NuGet.Build.Packaging.MultiTargeting.targets            | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.MultiTargeting.targets b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.MultiTargeting.targets
index d00bedb1..d5b5a802 100644
--- a/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.MultiTargeting.targets
+++ b/src/Build/NuGet.Build.Packaging.Tasks/NuGet.Build.Packaging.MultiTargeting.targets
@@ -50,7 +50,11 @@ Copyright (c) .NET Foundation. All rights reserved.
                     all builds.
   ============================================================
   -->
-	<Target Name="GetPackageContents" DependsOnTargets="_SetGetPackageContentsInnerTarget;DispatchToInnerBuilds" Returns="@(InnerOutput)" />
+	<Target Name="GetPackageContents" DependsOnTargets="_SetGetPackageContentsInnerTarget;DispatchToInnerBuilds" Returns="@(InnerOutput)">
+		<ItemGroup>
+			<_PackageContent Include="@(InnerOutput)" />
+		</ItemGroup>
+	</Target>
 
 	<Target Name="_SetGetPackageContentsInnerTarget">
 		<PropertyGroup>