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

Delay building metapackage to after runtime store generation 

Wait for all manifests to be generated
This commit is contained in:
= 2017-12-12 02:22:33 -08:00 committed by Nate McMaster
parent 4ed1ade289
commit 0554b12109
3 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
build/PackageArchive.targets
View File

@ -34,6 +34,11 @@
<!-- Copy the archive template --> <!-- Copy the archive template -->
<Copy SourceFiles="$(_TemplatesDirectory)Archive\Archive.csproj" DestinationFiles="$(_WorkRoot)Archive.csproj" /> <Copy SourceFiles="$(_TemplatesDirectory)Archive\Archive.csproj" DestinationFiles="$(_WorkRoot)Archive.csproj" />
<!-- Add .All metapacakge to PackageArtifact for LZMA generation -->
<ItemGroup>
<PackageArtifact Include="Microsoft.AspNetCore.All" LZMA="true" />
</ItemGroup>
<!-- Copy the archive template --> <!-- Copy the archive template -->
<RepoTasks.AddArchiveReferences <RepoTasks.AddArchiveReferences
ReferencePackagePath="$(_WorkRoot)Archive.csproj" ReferencePackagePath="$(_WorkRoot)Archive.csproj"

27
build/RuntimeStore.targets
View File

@ -28,11 +28,17 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<AllMetapackageFiles Include="$(_AllMetapackageDirectory)**\*" /> <AllMetapackageFiles Include="$(_AllMetapackageDirectory)**\*" />
<ManifestFiles Include="$(ArtifactsDir)*.xml" />
</ItemGroup> </ItemGroup>
<Copy SourceFiles="@(AllMetapackageFiles)" DestinationFolder="$(MetapackageWorkDirectory)\%(RecursiveDir)" /> <Copy SourceFiles="@(AllMetapackageFiles)" DestinationFolder="$(MetapackageWorkDirectory)\%(RecursiveDir)" />
<Copy SourceFiles="$(_SrcDirectory)Directory.Build.props" DestinationFolder="$(_WorkRoot)" /> <Copy SourceFiles="$(_SrcDirectory)Directory.Build.props" DestinationFolder="$(_WorkRoot)" />
<!-- Create a consolidated manifest and place in metapackage -->
<RepoTasks.ConsolidateManifests
Manifests="@(ManifestFiles)"
ManifestDestination="$(MetapackageWorkDirectory)build\aspnetcore-store-$(PackageVersion).xml"/>
<!-- Add references to project --> <!-- Add references to project -->
<RepoTasks.AddMetapackageReferences <RepoTasks.AddMetapackageReferences
ReferencePackagePath="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj" ReferencePackagePath="$(MetapackageWorkDirectory)Microsoft.AspNetCore.All.csproj"
@ -224,25 +230,4 @@
NewManifests="$(ArtifactsDir)$(CommonManifestFileName)" NewManifests="$(ArtifactsDir)$(CommonManifestFileName)"
ManifestDestination="$(ArtifactsDir)$(CommonManifestFileName)"/> ManifestDestination="$(ArtifactsDir)$(CommonManifestFileName)"/>
</Target> </Target>
<Target Name="AddManifestsToMetapackage">
<ItemGroup>
<MetaPackageNupkg Include="$(_DependencyBuildDirectory)Microsoft.AspNetCore.All.*.nupkg" />
<ManifestFiles Include="$(ArtifactsDir)*.xml"/>
</ItemGroup>
<RemoveDir Directories="$(_WorkRoot)" />
<UnzipArchive File="%(MetaPackageNupkg.FullPath)" Destination="$(_WorkRoot)" />
<!-- Create a consolidated manifest and place in metapackage -->
<RepoTasks.ConsolidateManifests
Manifests="@(ManifestFiles)"
ManifestDestination="$(_WorkRoot)\build\aspnetcore-store-$(PackageVersion).xml"/>
<ItemGroup>
<ArchiveFiles Include="$(_WorkRoot)**\*" />
</ItemGroup>
<ZipArchive File="$(ArtifactsDir)%(MetaPackageNupkg.FileName)%(MetaPackageNupkg.Extension)" SourceFiles="@(ArchiveFiles)" WorkingDirectory="$(_WorkRoot)" Overwrite="true" />
</Target>
</Project> </Project>

2
build/repo.targets
View File

@ -24,7 +24,7 @@
<CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn> <CleanDependsOn>$(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts</CleanDependsOn>
<RestoreDependsOn>$(RestoreDependsOn);RestoreExternalDependencies</RestoreDependsOn> <RestoreDependsOn>$(RestoreDependsOn);RestoreExternalDependencies</RestoreDependsOn>
<CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn> <CompileDependsOn>$(CompileDependsOn);BuildRepositories</CompileDependsOn>
<PackageDependsOn>$(PackageDependsOn);BuildAllMetapackage;BuildTemplates;SplitPackages</PackageDependsOn> <PackageDependsOn>$(PackageDependsOn);BuildTemplates;SplitPackages</PackageDependsOn>
<VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn> <VerifyDependsOn>$(VerifyDependsOn);VerifyCoherentVersions</VerifyDependsOn>
</PropertyGroup> </PropertyGroup>