Add WindowsDesktop targeting pack nupkg, refactor pkg projects (dotnet/core-setup...
authorDavis Goodin <dagood@users.noreply.github.com>
Fri, 22 Feb 2019 00:19:35 +0000 (18:19 -0600)
committerGitHub <noreply@github.com>
Fri, 22 Feb 2019 00:19:35 +0000 (18:19 -0600)
commitc21a5de846869c6cb7ffb8fdaada64aaadce52b8
treebc062753e730763443595121809b0fbecc2a0559
parentc2521851a0384a5f15f8cf31cac8862ccfd91f14
Add WindowsDesktop targeting pack nupkg, refactor pkg projects (dotnet/core-setup#5214)

* Refactor pkg projects

Instead of '.builds' projects, get Project items by calling a target in '.pkgproj' projects.

Move more common props/targets together.

* Add WindowsDesktop targeting pack nupkg

* Stop placing all files in data/ dir, only txt

* Change Pack nupkg type to DotnetPlatform

* Rename framework targets files

* Remove source redist: obsolete

* Require version files to be found and exist

Explicitly check if they exist to throw a clear error. The ReadAllText call would catch this, but it's verbose and doesn't say what the item's name is.

* DetermineRuntimeDependencies is not an override

* Remove package-specific asset exclusion

Use ExcludeAssets=All for CoreRT package to restore it but exclude Windows.winmd from redist.

Commit migrated from https://github.com/dotnet/core-setup/commit/2f91bd28d0c77eb72275f46ddd7cfc9f10196ba7
24 files changed:
src/installer/dependencies.props
src/installer/pkg/packages.builds
src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.pkgproj [deleted file]
src/installer/pkg/projects/Microsoft.NETCore.DotNetAppHost/Microsoft.NETCore.DotNetAppHost.builds [deleted file]
src/installer/pkg/projects/Microsoft.NETCore.DotNetHostPolicy/Microsoft.NETCore.DotNetHostPolicy.builds [deleted file]
src/installer/pkg/projects/Microsoft.NETCore.DotNetHostResolver/Microsoft.NETCore.DotNetHostResolver.builds [deleted file]
src/installer/pkg/projects/descriptions.json
src/installer/pkg/projects/dir.props
src/installer/pkg/projects/dir.targets
src/installer/pkg/projects/dir.traversal.targets
src/installer/pkg/projects/framework.dependency.targets [new file with mode: 0644]
src/installer/pkg/projects/framework.packaging.targets [new file with mode: 0644]
src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.Ref.pkgproj [moved from src/installer/pkg/projects/Microsoft.NETCore.App.Ref/Microsoft.NETCore.App.Ref.builds with 57% similarity]
src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.pkgproj [moved from src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.pkgproj with 68% similarity]
src/installer/pkg/projects/netcoreapp/pkg/Microsoft.NETCore.App.targets [moved from src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.targets with 100% similarity]
src/installer/pkg/projects/netcoreapp/pkg/dir.props [new file with mode: 0644]
src/installer/pkg/projects/netcoreapp/src/netcoreapp.depproj [moved from src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj with 62% similarity]
src/installer/pkg/projects/pkg.builds [moved from src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.builds with 85% similarity]
src/installer/pkg/projects/src.builds [moved from src/installer/pkg/projects/Microsoft.NETCore.App/Microsoft.NETCore.App.builds with 85% similarity]
src/installer/pkg/projects/windowsdesktop/pkg/Microsoft.WindowsDesktop.App.Ref.pkgproj [moved from src/installer/pkg/projects/Microsoft.NETCore.DotNetHost/Microsoft.NETCore.DotNetHost.builds with 50% similarity]
src/installer/pkg/projects/windowsdesktop/pkg/dir.props [new file with mode: 0644]
src/installer/pkg/projects/windowsdesktop/src/windowsdesktop.depproj [new file with mode: 0644]
src/installer/src.builds
tools-local/tasks/CreateFrameworkListFile.cs