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

Rename intermediate sharedfx archive to avoid conflicts with final file (#755)

This commit is contained in:
Nate McMaster 2018-01-05 16:34:39 -08:00 committed by GitHub
parent 8f163ed89a
commit 7bbfd2dcad
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/SharedFx.props
View File

@ -17,6 +17,12 @@
<!-- installers --> <!-- installers -->
<SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName> <SharedFxInstallerName>aspnetcore-runtime</SharedFxInstallerName>
<!--
This is named aspnetcore-runtime-internal because it only includes Microsoft.AspNetCore.All and is an intermediate file passed off to signing, installer generation, etc.
Subsequent build steps will combine this with Microsoft.NETCore.App and produce final tarballs/zips.
-->
<SharedFxIntermediateArchiveBaseName>$(SharedFxInstallerName)-internal</SharedFxIntermediateArchiveBaseName>
<DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile> <DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile>
<PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix> <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>
@ -26,7 +32,8 @@
<DotnetRuntimeInstallerName>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerName> <DotnetRuntimeInstallerName>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerName>
<DotnetRuntimeInstallerArchiveName>$(DotnetRuntimeInstallerName)-linux-x64.tar.gz</DotnetRuntimeInstallerArchiveName> <DotnetRuntimeInstallerArchiveName>$(DotnetRuntimeInstallerName)-linux-x64.tar.gz</DotnetRuntimeInstallerArchiveName>
<RuntimeTargzLink>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerArchiveName)</RuntimeTargzLink> <RuntimeTargzLink>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerArchiveName)</RuntimeTargzLink>
<SharedFxLinuxArchiveFilePath>$(_SharedFxSourceDir)$(SharedFxInstallerName)-$(PackageVersion)-linux-x64.tar.gz</SharedFxLinuxArchiveFilePath>
<SharedFxLinuxIntermediateArchiveFilePath>$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)-linux-x64.tar.gz</SharedFxLinuxIntermediateArchiveFilePath>
<!-- installer metadata --> <!-- installer metadata -->
<MaintainerName>Microsoft</MaintainerName> <MaintainerName>Microsoft</MaintainerName>

2
build/SharedFx.targets
View File

@ -292,7 +292,7 @@
<!-- Create archive --> <!-- Create archive -->
<ZipArchive <ZipArchive
File="$(SharedFxOutputPath)$(SharedFxInstallerName)-$(PackageVersion)-$(SharedFxRID).zip" File="$(SharedFxOutputPath)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)-$(SharedFxRID).zip"
SourceFiles="@(OutputZipFiles)" SourceFiles="@(OutputZipFiles)"
WorkingDirectory="$(SharedFxIntermediateOutputPath)" WorkingDirectory="$(SharedFxIntermediateOutputPath)"
Overwrite="true"/> Overwrite="true"/>

4
build/SharedFxInstaller.targets
View File

@ -10,7 +10,7 @@
</Exec> </Exec>
<Error Text="Docker host must be using Linux containers." Condition="'$(DockerHostOS)' != 'linux'"/> <Error Text="Docker host must be using Linux containers." Condition="'$(DockerHostOS)' != 'linux'"/>
<Error Text="Linux archive not found at $(SharedFxLinuxArchiveFilePath)." Condition="!Exists('$(SharedFxLinuxArchiveFilePath)')" /> <Error Text="Linux archive not found at $(SharedFxLinuxIntermediateArchiveFilePath)." Condition="!Exists('$(SharedFxLinuxIntermediateArchiveFilePath)')" />
</Target> </Target>
<Target Name="_DownloadInstallers"> <Target Name="_DownloadInstallers">
@ -29,7 +29,7 @@
<MakeDir Directories="$(_WorkRoot)" /> <MakeDir Directories="$(_WorkRoot)" />
<!-- Create layout: Aspnet Runtime --> <!-- Create layout: Aspnet Runtime -->
<Exec Command="tar -xzf $(SharedFxLinuxArchiveFilePath) -C $(_WorkRoot)" /> <Exec Command="tar -xzf $(SharedFxLinuxIntermediateArchiveFilePath) -C $(_WorkRoot)" />
<Exec Command="tar -xzf $(_InstallerSourceDir)$(DotnetRuntimeInstallerArchiveName) -C $(_WorkRoot)" /> <Exec Command="tar -xzf $(_InstallerSourceDir)$(DotnetRuntimeInstallerArchiveName) -C $(_WorkRoot)" />
<!-- Create Aspnet Runtime tar.gz --> <!-- Create Aspnet Runtime tar.gz -->