mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #2401 from dsplaisted/update-runtime-packs

Browse source 
Update runtime pack names
This commit is contained in:
Daniel Plaisted 2019-06-10 17:57:09 -07:00 • committed by GitHub
commit 5293e96d5a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/redist/targets/GenerateBundledVersions.targets
View file

@ -187,9 +187,7 @@ Copyright (c) .NET Foundation. All rights reserved.
LatestRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)" LatestRuntimeFrameworkVersion="$(_NETCoreAppPackageVersion)"
TargetingPackName="Microsoft.NETCore.App.Ref" TargetingPackName="Microsoft.NETCore.App.Ref"
TargetingPackVersion="$(NetCoreAppTargetingPackVersion)" TargetingPackVersion="$(NetCoreAppTargetingPackVersion)"
AppHostPackNamePattern="runtime.**RID**.Microsoft.NETCore.DotNetAppHost" RuntimePackNamePatterns="Microsoft.NETCore.App.Runtime.**RID**"
AppHostRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
RuntimePackNamePatterns="runtime.**RID**.Microsoft.NETCore.App%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostResolver%3Bruntime.**RID**.Microsoft.NETCore.DotNetHostPolicy"
RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(NetCoreRuntimePackRids, '%3B')"
PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)" PackagesToReference="Microsoft.NETCore.App/$(NetCoreAppTargetingPackVersion)"
IsTrimmable="true" IsTrimmable="true"
@ -209,7 +207,7 @@ Copyright (c) .NET Foundation. All rights reserved.
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true" IsWindowsOnly="true"
/> />
@ -221,7 +219,7 @@ Copyright (c) .NET Foundation. All rights reserved.
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true" IsWindowsOnly="true"
Profile="WPF" Profile="WPF"
@ -234,7 +232,7 @@ Copyright (c) .NET Foundation. All rights reserved.
LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)" LatestRuntimeFrameworkVersion="$(MicrosoftWindowsDesktopPackageVersion)"
TargetingPackName="Microsoft.WindowsDesktop.App.Ref" TargetingPackName="Microsoft.WindowsDesktop.App.Ref"
TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)" TargetingPackVersion="$(WindowsDesktopTargetingPackVersion)"
RuntimePackNamePatterns="runtime.**RID**.Microsoft.WindowsDesktop.App" RuntimePackNamePatterns="Microsoft.WindowsDesktop.App.Runtime.**RID**"
RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')" RuntimePackRuntimeIdentifiers="@(WindowsDesktopRuntimePackRids, '%3B')"
IsWindowsOnly="true" IsWindowsOnly="true"
Profile="WindowsForms" Profile="WindowsForms"