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

Explicitly specify metapackage version

This commit is contained in:
John Luo 2017-10-11 17:04:09 -07:00
parent 9aeefd3fd5
commit a48a3be6d7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
build/PackageArchive.targets
View File

@ -22,7 +22,8 @@
BuildArtifacts="@(ArtifactInfo)" BuildArtifacts="@(ArtifactInfo)"
PackageArtifacts="@(PackageArtifact)" PackageArtifacts="@(PackageArtifact)"
ExternalDependencies="@(ExternalDependency)" ExternalDependencies="@(ExternalDependency)"
RemoveTimestamp="$(RemoveTimestamp)" /> RemoveTimestamp="$(RemoveTimestamp)"
MetapackageVersion="$(MetapackageVersion)" />
<PropertyGroup> <PropertyGroup>
<FallbackStagingDir>$(_WorkRoot)obj\$(OutputPackageName)</FallbackStagingDir> <FallbackStagingDir>$(_WorkRoot)obj\$(OutputPackageName)</FallbackStagingDir>
@ -69,10 +70,10 @@
<MSBuild <MSBuild
Projects="$(MSBuildProjectFullPath)" Projects="$(MSBuildProjectFullPath)"
Targets="_BuildFallbackArchive" Targets="_BuildFallbackArchive"
Properties="DotNetRestoreSources=$(TimestampSource);OutputPackageName=$(TimestampOutputPackageName);RemoveTimestamp=false" /> Properties="DotNetRestoreSources=$(TimestampSource);OutputPackageName=$(TimestampOutputPackageName);RemoveTimestamp=false;MetapackageVersion=$(TimeStampVersion)" />
<MSBuild <MSBuild
Projects="$(MSBuildProjectFullPath)" Projects="$(MSBuildProjectFullPath)"
Targets="_BuildFallbackArchive" Targets="_BuildFallbackArchive"
Properties="DotNetRestoreSources=$(TimestampFreeSource);OutputPackageName=$(TimestampFreeOutputPackageName);RemoveTimestamp=true" /> Properties="DotNetRestoreSources=$(TimestampFreeSource);OutputPackageName=$(TimestampFreeOutputPackageName);RemoveTimestamp=true;MetapackageVersion=$(TimeStampFreeVersion)" />
</Target> </Target>
</Project> </Project>

11
build/tasks/AddArchiveReferences.cs
View File

@ -16,6 +16,9 @@ namespace RepoTasks
[Required] [Required]
public string ReferencePackagePath { get; set; } public string ReferencePackagePath { get; set; }
[Required]
public string MetaPackageVersion { get; set; }
[Required] [Required]
public bool RemoveTimestamp { get; set; } public bool RemoveTimestamp { get; set; }
@ -52,9 +55,11 @@ namespace RepoTasks
foreach (var package in archiveArtifacts) foreach (var package in archiveArtifacts)
{ {
var packageName = package.ItemSpec; var packageName = package.ItemSpec;
var packageVersion = buildArtifacts var packageVersion = string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase) ?
.Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) MetaPackageVersion :
.PackageInfo.Version.ToString(); buildArtifacts
.Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase))
.PackageInfo.Version.ToString();
if (RemoveTimestamp) if (RemoveTimestamp)
{ {