[master] Update dependencies from dnceng/internal/dotnet-wpf-int (dotnet/core-setup...

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190521.7

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19271.7

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190522.2

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19272.2

Dependency coherency updates

- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19271.2 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190522.4

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19272.4

Dependency coherency updates

- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19271.2 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190522.11

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19272.11

Dependency coherency updates

- Microsoft.Private.Winforms - 4.8.0-preview6.19266.1 (parent: Microsoft.DotNet.Wpf.DncEng)
- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19272.6 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190523.5

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19273.5

Dependency coherency updates

- Microsoft.Private.Winforms - 4.8.0-preview6.19266.1 (parent: Microsoft.DotNet.Wpf.DncEng)
- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19273.1 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190523.6

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19273.6

Dependency coherency updates

- Microsoft.Private.Winforms - 4.8.0-preview6.19272.1 (parent: Microsoft.DotNet.Wpf.DncEng)
- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19273.1 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190523.7

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19273.7

Dependency coherency updates

- Microsoft.Private.Winforms - 4.8.0-preview6.19272.1 (parent: Microsoft.DotNet.Wpf.DncEng)
- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19273.1 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190524.5

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19274.5

Dependency coherency updates

- Microsoft.Private.Winforms - 4.8.0-preview6.19272.1 (parent: Microsoft.DotNet.Wpf.DncEng)
- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19273.5 (parent: Microsoft.DotNet.Wpf.DncEng)

* Update dependencies from https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int build 20190524.6

- Microsoft.DotNet.Wpf.DncEng - 4.8.0-preview6.19274.6

Dependency coherency updates

- Microsoft.Private.Winforms - 4.8.0-preview6.19272.1 (parent: Microsoft.DotNet.Wpf.DncEng)
- Microsoft.DotNet.Wpf.GitHub - 4.8.0-preview6.19273.5 (parent: Microsoft.DotNet.Wpf.DncEng)

* Fix WindowsDesktop package validation

The wpf-int change allows NuGet to pick up the native files, including PDBs. This lets us remove a workaround target, but causes some duplicates that must be filtered out due to assumptions the packaging tooling makes.

Commit migrated from https://github.com/dotnet/core-setup/commit/1ac29fa4fed3f5658864593e9b649238f52f3748

diff --git a/src/installer/pkg/projects/dir.targets b/src/installer/pkg/projects/dir.targets
index aad832a..1345006 100644 (file)
--- a/src/installer/pkg/projects/dir.targets
+++ b/src/installer/pkg/projects/dir.targets
@@ -20,6 +20,31 @@
   </PropertyGroup>
 
   <!--
+    Remove duplicate files returned by PrereleaseResolveNuGetPackageAssets. The resolve task
+    performs extra detection to pick up a PDB file for any file listed in the assets file. This
+    causes duplicates if the assets file lists PDBs. If foo.dll and foo.pdb exist in the package and
+    both are listed in the assets file, the task finds:
+
+      foo.dll
+      foo.pdb (based on foo.dll entry)
+      foo.pdb
+      foo.pdb (based on foo.pdb entry)
+
+    The duplicates cause package validation failure and must be filtered out.
+  -->
+  <Target Name="RemoveDuplicateResolvedNuGetPackageAssets"
+          AfterTargets="ResolveNuGetPackages">
+    <RemoveDuplicates Inputs="@(ReferenceCopyLocalPaths)">
+      <Output TaskParameter="Filtered" ItemName="FilteredReferenceCopyLocalPaths"/>
+    </RemoveDuplicates>
+
+    <ItemGroup>
+      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" />
+      <ReferenceCopyLocalPaths Include="@(FilteredReferenceCopyLocalPaths)" />
+    </ItemGroup>
+  </Target>
+
+  <!--
     Finds symbol files and injects them into the package build.
   -->
   <Target Name="GetSymbolPackageFiles" BeforeTargets="GetPackageFiles">

diff --git a/src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj b/src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj
index 8d37b63..96eb949 100644 (file)
--- a/src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj
+++ b/src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj
@@ -33,25 +33,6 @@
     <PackageReference Include="@(RuntimeOnlyPackageReference)" ExcludeAssets="Compile" />
   </ItemGroup>
 
-  <!-- Pick up unconventional WPF runtime package natives in lib\<rid>. -->
-  <Target Name="GetLibNativeFilePackagePaths"
-          BeforeTargets="GetFilesFromPackages"
-          Condition="'$(NuGetRuntimeIdentifier)' != ''">
-    <ItemGroup>
-      <_lowercasePackageId
-        Include="$([System.String]::new('runtime.$(NuGetRuntimeIdentifier).%(PackageReference.Identity)').ToLowerInvariant())"
-        NuGetPackageId="%(PackageReference.Identity)"
-        Version="%(PackageReference.Version)" />
-
-      <_packageNativeDir Include="@(_lowercasePackageId -> '$(PackagesDir)%(Identity)/%(Version)/lib/$(NuGetRuntimeIdentifier)/')" />
-
-      <ReferenceCopyLocalPaths
-        Include="%(_packageNativeDir.Identity)**/*.*"
-        IsNative="true"
-        NuGetPackageId="%(_packageNativeDir.NuGetPackageId)" />
-    </ItemGroup>
-  </Target>
-
   <!--
     Version.txt files aren't provided in some packages. However, they're not necessary anymore:
     dependency information is now in Version.Details.xml and BAR. Stub the target to ignore.