diff options
author | Davis Goodin <dagood@users.noreply.github.com> | 2019-02-14 03:35:25 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-14 03:35:25 +0300 |
commit | a0f02947bc71ef8da0f9e1eb826921045821f09b (patch) | |
tree | 3b12fa7e2d091b3a72e00cde5df40763384f7ba7 /tools-local | |
parent | 9c62250db9e43b5eb672566fae8bb8d73bfe5c43 (diff) |
Create targeting pack MSI installers (dotnet/core-setup#5114)
* Create targeting pack MSI
This change has the targeting pack pkgproj create an install layout based on the nupkg's data/ dir. That's picked up by the targeting pack installer project the same way it is for hostfxr and shared framework. In general, the targeting pack installer project is a copy of existing installers with very little changed.
In official builds, build the full platform manifest on win-x86, not just win-x64. Both platforms' installers need the full manifest.
* Change install dir "ref" => "packs"
* "Microsoft .NET Core Targeting Pack" branding
* Remove "netcoreapp" from MSI filename
The name "dotnet-targeting-pack" brings it in line with installer names like "dotnet-runtime" and "dotnet-host".
* Fix targeting pack powershell script: PR comments
I plan to remove this script entirely, but it might as well be a little cleaner while development is ongoing.
* Fix DependencyKey: Dotnet_CLI => Dotnet_Core
* Fix typo: GeneratedGui => GeneratedGuid
Commit migrated from https://github.com/dotnet/core-setup/commit/0f10c29471af71b020b0c1513f28356660df1eab
Diffstat (limited to 'tools-local')
-rw-r--r-- | tools-local/tasks/GenerateGuidFromName.cs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tools-local/tasks/GenerateGuidFromName.cs b/tools-local/tasks/GenerateGuidFromName.cs index 66e424650fa..f64885cf502 100644 --- a/tools-local/tasks/GenerateGuidFromName.cs +++ b/tools-local/tasks/GenerateGuidFromName.cs @@ -12,8 +12,9 @@ namespace Microsoft.DotNet.Build.Tasks { [Required] public string Name { get; set; } + [Output] - public string GeneratedGui { get; set; } + public string GeneratedGuid { get; set; } // Generate a Version 5 (SHA1 Name Based) Guid from a name. public override bool Execute() @@ -44,7 +45,7 @@ namespace Microsoft.DotNet.Build.Tasks SwapGuidByteOrder(res); - GeneratedGui = (new Guid(res)).ToString(); + GeneratedGuid = (new Guid(res)).ToString(); } return true; |