From c3a66aea8f80fff4dc1e7e637217845bb540615c Mon Sep 17 00:00:00 2001
From: luqunl <luqunl@LUQUN03>
Date: Mon, 20 Aug 2018 16:00:20 -0700
Subject: [PATCH] Use NuGetPackageId to exclude Windows nuget package

Commit migrated from https://github.com/dotnet/core-setup/commit/ca1206dad2174231f1ed2f09dbab53a627708ef0
---
 .../projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
index fd495f0..ccb676e 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
@@ -144,8 +144,8 @@
   <!-- Fetches all the file items from the packages that we want to redist -->
   <Target Name="GetFilesFromPackages" DependsOnTargets="GetPackagePaths">
     <ItemGroup Condition="'$(NuGetRuntimeIdentifier)' != ''">
-      <!-- RID-specific: include all runtime files except Windows.winmd -->
-      <FilesToPackage Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.FileName)%(ReferenceCopyLocalPaths.Extension)' != 'Windows.winmd'">
+      <!-- RID-specific: include all runtime files except files in Microsoft.TargetingPack.Private.WinRT -->
+      <FilesToPackage Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.NuGetPackageId)' != 'Microsoft.TargetingPack.Private.WinRT'">
         <!-- ResolveNugetPackageAssets doesn't preserve the asset type (native),
              calculate it by looking for native in the path -->
         <IsNative Condition="$([System.String]::new('%(Identity)').ToLowerInvariant().Replace('\', '/').Contains('/native/'))">true</IsNative>
-- 
2.7.4