diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index a5f9c15ab6..a78b6c6408 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -22,7 +22,8 @@ BuildArtifacts="@(ArtifactInfo)" PackageArtifacts="@(PackageArtifact)" ExternalDependencies="@(ExternalDependency)" - RemoveTimestamp="$(RemoveTimestamp)" /> + RemoveTimestamp="$(RemoveTimestamp)" + MetapackageVersion="$(MetapackageVersion)" /> $(_WorkRoot)obj\$(OutputPackageName) @@ -69,10 +70,10 @@ + Properties="DotNetRestoreSources=$(TimestampSource);OutputPackageName=$(TimestampOutputPackageName);RemoveTimestamp=false;MetapackageVersion=$(TimeStampVersion)" /> + Properties="DotNetRestoreSources=$(TimestampFreeSource);OutputPackageName=$(TimestampFreeOutputPackageName);RemoveTimestamp=true;MetapackageVersion=$(TimeStampFreeVersion)" /> diff --git a/build/tasks/AddArchiveReferences.cs b/build/tasks/AddArchiveReferences.cs index 9ad3c815dc..8bc770b694 100644 --- a/build/tasks/AddArchiveReferences.cs +++ b/build/tasks/AddArchiveReferences.cs @@ -16,6 +16,9 @@ namespace RepoTasks [Required] public string ReferencePackagePath { get; set; } + [Required] + public string MetaPackageVersion { get; set; } + [Required] public bool RemoveTimestamp { get; set; } @@ -52,9 +55,11 @@ namespace RepoTasks foreach (var package in archiveArtifacts) { var packageName = package.ItemSpec; - var packageVersion = buildArtifacts - .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) - .PackageInfo.Version.ToString(); + var packageVersion = string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase) ? + MetaPackageVersion : + buildArtifacts + .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) + .PackageInfo.Version.ToString(); if (RemoveTimestamp) {