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

Trim common manifest

This commit is contained in:
= 2017-12-12 01:27:57 -08:00 committed by Nate McMaster
parent 997e31805b
commit 4ed1ade289
2 changed files with 43 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/RuntimeStore.targets
View File

@ -207,6 +207,7 @@
<!-- Trim packages guaranteed to be in the runtime but isn't included in our runtime store --> <!-- Trim packages guaranteed to be in the runtime but isn't included in our runtime store -->
<ItemGroup> <ItemGroup>
<PackagesToTrim Include="runtime.win-arm64.runtime.native.system.data.sqlclient.sni" /> <PackagesToTrim Include="runtime.win-arm64.runtime.native.system.data.sqlclient.sni" />
<ExistingStoreManifests Include="$(_ExistingManifestsDirectory)*.xml" />
</ItemGroup> </ItemGroup>
<MSBuild Projects="$(_WorkRoot)RS.Manifest\RS.Manifest.csproj" <MSBuild Projects="$(_WorkRoot)RS.Manifest\RS.Manifest.csproj"
@ -216,6 +217,12 @@
</MSBuild> </MSBuild>
<RepoTasks.CreateCommonManifest DestinationFilePath="$(ArtifactsDir)$(CommonManifestFileName)" PackageDefinitions="@(_PackageDefinitions)" Packages="@(PackagesToTrim)"/> <RepoTasks.CreateCommonManifest DestinationFilePath="$(ArtifactsDir)$(CommonManifestFileName)" PackageDefinitions="@(_PackageDefinitions)" Packages="@(PackagesToTrim)"/>
<!-- Trim built manifest with existing manifests -->
<RepoTasks.ComposeNewStore
ExistingManifests="@(ExistingStoreManifests)"
NewManifests="$(ArtifactsDir)$(CommonManifestFileName)"
ManifestDestination="$(ArtifactsDir)$(CommonManifestFileName)"/>
</Target> </Target>
<Target Name="AddManifestsToMetapackage"> <Target Name="AddManifestsToMetapackage">

12
build/tasks/ComposeNewStore.cs
View File

@ -17,19 +17,15 @@ namespace RepoTasks
[Required] [Required]
public ITaskItem[] NewManifests { get; set; } public ITaskItem[] NewManifests { get; set; }
[Required]
public ITaskItem[] RuntimeStoreFiles { get; set; } public ITaskItem[] RuntimeStoreFiles { get; set; }
[Required]
public ITaskItem[] RuntimeStoreSymbolFiles { get; set; } public ITaskItem[] RuntimeStoreSymbolFiles { get; set; }
[Required] [Required]
public string ManifestDestination { get; set; } public string ManifestDestination { get; set; }
[Required]
public string StoreDestination { get; set; } public string StoreDestination { get; set; }
[Required]
public string SymbolsDestination { get; set; } public string SymbolsDestination { get; set; }
public override bool Execute() public override bool Execute()
@ -58,6 +54,8 @@ namespace RepoTasks
} }
} }
if (RuntimeStoreFiles != null)
{
// Insert new runtime store files // Insert new runtime store files
foreach (var storeFile in RuntimeStoreFiles) foreach (var storeFile in RuntimeStoreFiles)
{ {
@ -78,8 +76,11 @@ namespace RepoTasks
File.Copy(storeFile.GetMetadata("FullPath"), Path.Combine(destinationDir, $"{storeFile.GetMetadata("Filename")}{storeFile.GetMetadata("Extension")}"), overwrite: true); File.Copy(storeFile.GetMetadata("FullPath"), Path.Combine(destinationDir, $"{storeFile.GetMetadata("Filename")}{storeFile.GetMetadata("Extension")}"), overwrite: true);
} }
} }
}
// Insert new runtime store files if (RuntimeStoreSymbolFiles != null)
{
// Insert new runtime store symbol files
foreach (var symbolFile in RuntimeStoreSymbolFiles) foreach (var symbolFile in RuntimeStoreSymbolFiles)
{ {
// format: {bitness}}/{tfm}}/{id}/{version}}/... // format: {bitness}}/{tfm}}/{id}/{version}}/...
@ -99,6 +100,7 @@ namespace RepoTasks
File.Copy(symbolFile.GetMetadata("FullPath"), Path.Combine(destinationDir, $"{symbolFile.GetMetadata("Filename")}{symbolFile.GetMetadata("Extension")}"), overwrite: true); File.Copy(symbolFile.GetMetadata("FullPath"), Path.Combine(destinationDir, $"{symbolFile.GetMetadata("Filename")}{symbolFile.GetMetadata("Extension")}"), overwrite: true);
} }
} }
}
// Purge existing packages from manifest // Purge existing packages from manifest
foreach (var newManifest in NewManifests) foreach (var newManifest in NewManifests)