huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Always produce a .zip and .tar.gz for the targeting pack (#11230)

This commit is contained in:
Nate McMaster 2019-06-14 11:50:34 -07:00 committed by GitHub
parent 9466ec702f
commit 87106707d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/BuildFromSource.md
View File

@ -11,7 +11,7 @@ See https://github.com/aspnet/AspNetCore/labels/area-infrastructure for known is
Building ASP.NET Core on Windows requires: Building ASP.NET Core on Windows requires:
* Windows 10 * Windows 10, version 1803 or newer
* At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies) * At least 10 GB of disk space and a good internet connection (our build scripts download a lot of tools and dependencies)
* Visual Studio 2019. <https://visualstudio.com> * Visual Studio 2019. <https://visualstudio.com>
* To install the exact required components, run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1). * To install the exact required components, run [eng/scripts/InstallVisualStudio.ps1](/eng/scripts/InstallVisualStudio.ps1).

21
src/Framework/ref/Microsoft.AspNetCore.App.Ref.csproj
View File

@ -56,9 +56,9 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<LayoutTargetDir>$(TargetingPackLayoutRoot)$(TargetingPackSubPath)</LayoutTargetDir> <LayoutTargetDir>$(TargetingPackLayoutRoot)$(TargetingPackSubPath)</LayoutTargetDir>
<LocalInstallationOutputPath>$(LocalDotNetRoot)$(TargetingPackSubPath)</LocalInstallationOutputPath> <LocalInstallationOutputPath>$(LocalDotNetRoot)$(TargetingPackSubPath)</LocalInstallationOutputPath>
<ArchiveOutputFileName Condition="'$(TargetRuntimeIdentifier)' == 'win-x64'">aspnetcore-targeting-pack-$(PackageVersion).zip</ArchiveOutputFileName> <ArchiveOutputFileName>aspnetcore-targeting-pack-$(PackageVersion)</ArchiveOutputFileName>
<ArchiveOutputFileName Condition="'$(TargetRuntimeIdentifier)' == 'linux-x64'">aspnetcore-targeting-pack-$(PackageVersion).tar.gz</ArchiveOutputFileName> <ZipArchiveOutputPath>$(InstallersOutputPath)$(ArchiveOutputFileName).zip</ZipArchiveOutputPath>
<ArchiveOutputPath>$(InstallersOutputPath)$(ArchiveOutputFileName)</ArchiveOutputPath> <TarArchiveOutputPath>$(InstallersOutputPath)$(ArchiveOutputFileName).tar.gz</TarArchiveOutputPath>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
@ -161,18 +161,17 @@ This package is an internal implementation of the .NET Core SDK and is not meant
<Target Name="_CreateTargetingPackArchive" <Target Name="_CreateTargetingPackArchive"
Inputs="@(RefPackContent)" Inputs="@(RefPackContent)"
Outputs="$(ArchiveOutputPath)" Outputs="$(ZipArchiveOutputPath);$(TarArchiveOutputPath)"
Condition="'$(IsPackable)' == 'true'"> Condition="'$(IsPackable)' == 'true'">
<ZipDirectory <ZipDirectory
SourceDirectory="$(TargetingPackLayoutRoot)" SourceDirectory="$(TargetingPackLayoutRoot)"
DestinationFile="$(ArchiveOutputPath)" DestinationFile="$(ZipArchiveOutputPath)"
Overwrite="true" Overwrite="true" />
Condition="'$(TargetRuntimeIdentifier)' == 'win-x64'" /> <!-- Requires Windows 10 version 1803 or newer -->
<Exec <Exec
Command="tar -czf $(ArchiveOutputPath) ." Command="tar -czf $(TarArchiveOutputPath) ."
WorkingDirectory="$(TargetingPackLayoutRoot)" WorkingDirectory="$(TargetingPackLayoutRoot)" />
Condition="'$(TargetRuntimeIdentifier)' == 'linux-x64'" /> <Message Importance="High" Text="$(MSBuildProjectName) -> $(TarArchiveOutputPath)" />
<Message Importance="High" Text="$(MSBuildProjectName) -> $(ArchiveOutputPath)" />
</Target> </Target>
</Project> </Project>