Merge in 'release/5.0' changes

This commit is contained in:
dotnet-bot 2021-01-13 19:37:19 +00:00
commit 5386c92f74
1 changed files with 3 additions and 2 deletions

View File

@ -154,7 +154,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<LocalInstallationOutputPath>$(LocalDotNetRoot)$(SharedRuntimeSubPath)</LocalInstallationOutputPath>
<FrameworkListFileName>RuntimeList.xml</FrameworkListFileName>
<FrameworkListOutputPath>$(SharedFxLayoutTargetDir)$(FrameworkListFileName)</FrameworkListOutputPath>
<FrameworkListOutputPath>$(ArtifactsObjDir)$(FrameworkListFileName)</FrameworkListOutputPath>
<InternalArchiveOutputFileName>$(InternalInstallerBaseName)-$(PackageVersion)-$(TargetRuntimeIdentifier)$(ArchiveExtension)</InternalArchiveOutputFileName>
<InternalArchiveOutputPath>$(InstallersOutputPath)$(InternalArchiveOutputFileName)</InternalArchiveOutputPath>
@ -545,7 +545,8 @@ This package is an internal implementation of the .NET Core SDK and is not meant
RootAttributes="@(FrameworkListRootAttributes)" />
<ItemGroup>
<RuntimePackContent Include="$(FrameworkListOutputPath)" PackagePath="$(ManifestsPackagePath)" />
<!-- We only need RuntimeList.xml in the .nupkg, so we intentionally do not include it in the archives -->
<_PackageFiles Include="$(FrameworkListOutputPath)" PackagePath="$(ManifestsPackagePath)" />
<_PackageFiles Include="@(RuntimePackContent)" />
</ItemGroup>
</Target>