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

Put installers into artifacts/installers/ and the lzma into artifacts/lzma/

This commit is contained in:
Nate McMaster 2017-10-17 17:56:31 -07:00
parent 3a563b15fa
commit d5df2acd45
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/PackageArchive.targets
View File

@ -45,7 +45,8 @@
<PropertyGroup> <PropertyGroup>
<FallbackStagingDir>$(_WorkRoot)obj\$(OutputPackageName)</FallbackStagingDir> <FallbackStagingDir>$(_WorkRoot)obj\$(OutputPackageName)</FallbackStagingDir>
<FallbackOutputArchive>$(RepositoryRoot)artifacts\$(OutputPackageName).lzma</FallbackOutputArchive> <FallbackOutputDir>$(ArtifactsDir)lzma\</FallbackOutputDir>
<FallbackOutputPath>$(FallbackOutputDir)$(OutputPackageName).lzma</FallbackOutputPath>
<GeneratedFallbackRestoreSourcesPropsPath>$(_WorkRoot)restoresources.$(OutputPackageName).props</GeneratedFallbackRestoreSourcesPropsPath> <GeneratedFallbackRestoreSourcesPropsPath>$(_WorkRoot)restoresources.$(OutputPackageName).props</GeneratedFallbackRestoreSourcesPropsPath>
</PropertyGroup> </PropertyGroup>
@ -59,7 +60,7 @@
OutputPath="$(GeneratedFallbackRestoreSourcesPropsPath)" /> OutputPath="$(GeneratedFallbackRestoreSourcesPropsPath)" />
<!-- Create the Staging Dir --> <!-- Create the Staging Dir -->
<MakeDir Directories="$(FallbackStagingDir)" /> <MakeDir Directories="$(FallbackStagingDir);$(FallbackOutputDir)" />
<!-- Restore the target project --> <!-- Restore the target project -->
<MSBuild <MSBuild
@ -68,6 +69,6 @@
Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true" /> Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(MicrosoftNETCoreApp20PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);AspNetUniverseBuildOffline=true" />
<!-- Create the archive --> <!-- Create the archive -->
<Exec Command="$(ArchiverPath) -a $(FallbackOutputArchive) $(FallbackStagingDir)" /> <Exec Command="$(ArchiverPath) -a $(FallbackOutputPath) $(FallbackStagingDir)" />
</Target> </Target>
</Project> </Project>

7
build/RuntimeStoreInstaller.targets
View File

@ -11,6 +11,7 @@
<_WorkLayoutDir>$(_WorkRoot).l\</_WorkLayoutDir> <_WorkLayoutDir>$(_WorkRoot).l\</_WorkLayoutDir>
<_WorkOutputDir>$(_WorkRoot).o\</_WorkOutputDir> <_WorkOutputDir>$(_WorkRoot).o\</_WorkOutputDir>
<_DockerRootDirectory>/opt/code/</_DockerRootDirectory> <_DockerRootDirectory>/opt/code/</_DockerRootDirectory>
<InstallersOutputDir>$(ArtifactsDir)installers\</InstallersOutputDir>
<RSInstallerName>aspnetcore-store</RSInstallerName> <RSInstallerName>aspnetcore-store</RSInstallerName>
<HostingInstallerName>dotnet-hosting</HostingInstallerName> <HostingInstallerName>dotnet-hosting</HostingInstallerName>
@ -69,7 +70,7 @@
<Exec Command="tar -xzf $(RuntimeArchive) -C $(_WorkRoot)" /> <Exec Command="tar -xzf $(RuntimeArchive) -C $(_WorkRoot)" />
<!-- Create Aspnet Hosting Bundle tar.gz --> <!-- Create Aspnet Hosting Bundle tar.gz -->
<Exec Command="tar -czvf $(ArtifactsDir)$(HostingArchiveName) ." WorkingDirectory="$(_WorkRoot)"/> <Exec Command="tar -czvf $(InstallersOutputDir)$(HostingArchiveName) ." WorkingDirectory="$(_WorkRoot)"/>
</Target> </Target>
<Target Name="GenerateTargzs" DependsOnTargets="_EnsureInstallerPrerequisites;_DownloadCoreInstallers"> <Target Name="GenerateTargzs" DependsOnTargets="_EnsureInstallerPrerequisites;_DownloadCoreInstallers">
@ -143,7 +144,7 @@
-s dir -s dir
-t rpm -t rpm
-n $(RPMInstallerPrefix)-$(RPMVersion) -n $(RPMInstallerPrefix)-$(RPMVersion)
-p $(_DockerRootDirectory)artifacts/$(RPMInstallerPrefix)-$(RPMVersion)-$(RPMFileSuffix) -p $(_DockerRootDirectory)artifacts/installers/$(RPMInstallerPrefix)-$(RPMVersion)-$(RPMFileSuffix)
-v $(RPMVersion) -v $(RPMVersion)
--iteration $(RPMRevision) --iteration $(RPMRevision)
-a amd64 -a amd64
@ -355,7 +356,7 @@
<Error Text="@(GeneratedDebFiles->Count()) deb installer files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" /> <Error Text="@(GeneratedDebFiles->Count()) deb installer files generated." Condition="'@(GeneratedDebFiles->Count())' != 1" />
<Copy <Copy
DestinationFiles="$(ArtifactsDir)$(DebPrefix)-$(DebVersion)-$(Image)-x64.deb" DestinationFiles="$(InstallersOutputDir)$(DebPrefix)-$(DebVersion)-$(Image)-x64.deb"
SourceFiles="@(GeneratedDebFiles)" SourceFiles="@(GeneratedDebFiles)"
OverwriteReadOnlyFiles="True" OverwriteReadOnlyFiles="True"
SkipUnchangedFiles="False" SkipUnchangedFiles="False"