提交 42e81388 编写于 作者: D Davis Goodin 提交者: GitHub

Add root "shared" dir to WindowsDesktop zip (dotnet/core-setup#7581)

Also fix a small bug where both the new and old infrastructure were creating a zip for the NETCoreApp sfx. This wasn't causing a problem in parallel because they are ordered, but it made it unclear to a reader which infra was responsible for the zip.

Commit migrated from https://github.com/dotnet/core-setup/commit/732ef42a49e82b1bfbe1363fa6799b34d7e8ef34
上级 aa09e694
......@@ -83,9 +83,15 @@
<CompressedArchiveFile>$(AssetOutputPath)$(InstallerFileNameWithoutExtension)$(CompressedFileExtension)</CompressedArchiveFile>
</PropertyGroup>
<!-- By default, a shared framework only has files in shared/, so archive that. -->
<!--
Set the directory containing contents to include in the archive (zip/tarball). This default
means the "shared" dir is inside the archive and it can be extracted directly into the dotnet
home dir. This allows the .NET Core Runtime archive to include files outside the "shared" dir,
such as the host, resolver, and license files, without special handling vs. WindowsDesktop and
ASP.NET Core sharedfx.
-->
<PropertyGroup>
<SharedFrameworkArchiveSourceDir Condition="'$(SharedFrameworkArchiveSourceDir)' == ''">$(SharedFrameworkLayoutDir)shared/</SharedFrameworkArchiveSourceDir>
<SharedFrameworkArchiveSourceDir Condition="'$(SharedFrameworkArchiveSourceDir)' == ''">$(SharedFrameworkLayoutDir)</SharedFrameworkArchiveSourceDir>
</PropertyGroup>
</Target>
......
......@@ -15,6 +15,9 @@
<!-- These components are installed by the root shared framework, but not others. -->
<IncludeWerRelatedKeys>true</IncludeWerRelatedKeys>
<IncludeBreadcrumbStoreFolder>true</IncludeBreadcrumbStoreFolder>
<!-- The zip/tarball is built by legacy infrastructure. -->
<GenerateCompressedArchive>false</GenerateCompressedArchive>
</PropertyGroup>
<ItemGroup>
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册