From 8aff01947a77abe41f000a3cb6005dc11831c351 Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 10 Jun 2019 15:32:28 -0700 Subject: [PATCH 1/2] Update runtime pack names --- src/redist/targets/GenerateBundledVersions.targets | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index a2f854bdc..d04825e04 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -189,7 +189,7 @@ Copyright (c) .NET Foundation. All rights reserved. TargetingPackVersion="$(NetCoreAppTargetingPackVersion)" AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost" AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.NETCore.App%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostResolver%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostPolicy" + RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)" IsTrimmable="true" @@ -209,7 +209,7 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" + RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" IsWindowsOnly="true" /> @@ -221,7 +221,7 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" + RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" IsWindowsOnly="true" Profile="WPF" @@ -234,7 +234,7 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" - RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" + RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" IsWindowsOnly="true" Profile="WindowsForms" From da3a92ae63799731426d169d6e97067f1d81c39a Mon Sep 17 00:00:00 2001 From: Daniel Plaisted Date: Mon, 10 Jun 2019 17:29:39 -0700 Subject: [PATCH 2/2] Remove unused apphost metadata from KnownFrameworkReference --- src/redist/targets/GenerateBundledVersions.targets | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets index d04825e04..80c5dff92 100644 --- a/src/redist/targets/GenerateBundledVersions.targets +++ b/src/redist/targets/GenerateBundledVersions.targets @@ -187,8 +187,6 @@ Copyright (c) .NET Foundation. All rights reserved. LatestRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)" TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackVersion="$(NetCoreAppTargetingPackVersion)" - AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost" - AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**" RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)"