From 974917fac7f028ae06c8de263b7ce9fd849d2a3d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 23 Mar 2018 14:09:21 -0700 Subject: [PATCH 01/12] Updating submodule(s) EntityFrameworkCore => af5677fa86908b13dfa98d4d55d674147f739e62 Hosting => 05d1a6eb0e051a0cbadc64246f77fe9b836d33a6 KestrelHttpServer => 63fd1e1a4d2371778ff90a31632728efefe66cc9 Razor => adc7184d9824b0606950e97bbaf761b535e5f938 SignalR => a9667c3fbdb29b7c118b70ab6a1c5296a0051291 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/Hosting | 2 +- modules/KestrelHttpServer | 2 +- modules/Razor | 2 +- modules/SignalR | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index e67ec978a7..af5677fa86 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit e67ec978a783cf25a30bed162b02446910033d6b +Subproject commit af5677fa86908b13dfa98d4d55d674147f739e62 diff --git a/modules/Hosting b/modules/Hosting index 1bac12716d..05d1a6eb0e 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 1bac12716d291ac9f14300978e9569471404139a +Subproject commit 05d1a6eb0e051a0cbadc64246f77fe9b836d33a6 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index abdcb47b8f..63fd1e1a4d 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit abdcb47b8f96d7bf6554575e2d3493a7e955fc68 +Subproject commit 63fd1e1a4d2371778ff90a31632728efefe66cc9 diff --git a/modules/Razor b/modules/Razor index 881fb49f73..adc7184d98 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 881fb49f737e7c301f4d3ba81fe6f1c7c671f7bf +Subproject commit adc7184d9824b0606950e97bbaf761b535e5f938 diff --git a/modules/SignalR b/modules/SignalR index 2e63e5afe3..a9667c3fbd 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 2e63e5afe31e9bba15e4737fc252bcd20c621758 +Subproject commit a9667c3fbdb29b7c118b70ab6a1c5296a0051291 From 8bbbdff3e863aad96026fa6b8080eb3f0f1cb7ce Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 23 Mar 2018 14:09:31 -0700 Subject: [PATCH 02/12] Updating BuildTools from 2.1.0-preview2-15748 to 2.1.0-preview2-15749 [auto-updated: buildtools] --- korebuild-lock.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a8b269a5b1..b8e036fe2c 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview2-15748 +version:2.1.0-preview2-15749 commithash:5544c9ab20fa5e24b9e155d8958a3c3b6f5f9df9 From 4a8f9698ea8607603462709ef222f9ee9ab18d03 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 23 Mar 2018 21:46:18 +0000 Subject: [PATCH 03/12] Updating submodule(s) EntityFrameworkCore => eead48dda8fb9df77cb250f3680b67423c2d1cd6 Mvc => 14429721d933104e17bd5cae0b7f2399ca55ab2d [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/Mvc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index af5677fa86..eead48dda8 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit af5677fa86908b13dfa98d4d55d674147f739e62 +Subproject commit eead48dda8fb9df77cb250f3680b67423c2d1cd6 diff --git a/modules/Mvc b/modules/Mvc index 1d6c09ab31..14429721d9 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 1d6c09ab3182d325c9b2a356623ce8670e8310d4 +Subproject commit 14429721d933104e17bd5cae0b7f2399ca55ab2d From 3ec77938bcfa3ebda6b3a15be289aa02fb934dc2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 23 Mar 2018 15:58:22 -0700 Subject: [PATCH 04/12] Updating submodule(s) EntityFrameworkCore => 1a22d0f6482d0bd74b5a1f6ec3fec1e5d038e539 HttpClientFactory => 0ac7e425348ffd9fe1224c1035982838408774de IISIntegration => 731f05df3801a8bc152b37ad788f4ddd1dee9714 Mvc => 1ff5bdca796d48293a42015d77528851684db669 Security => 405e7bce54b021ee18070d3cf40b25d4dab27870 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/HttpClientFactory | 2 +- modules/IISIntegration | 2 +- modules/Mvc | 2 +- modules/Security | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index eead48dda8..1a22d0f648 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit eead48dda8fb9df77cb250f3680b67423c2d1cd6 +Subproject commit 1a22d0f6482d0bd74b5a1f6ec3fec1e5d038e539 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index b39334e811..0ac7e42534 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit b39334e8114cf927102b2e1fe10372ebda532076 +Subproject commit 0ac7e425348ffd9fe1224c1035982838408774de diff --git a/modules/IISIntegration b/modules/IISIntegration index 79b038afb4..731f05df38 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 79b038afb44b5267f429efdc270659de77519361 +Subproject commit 731f05df3801a8bc152b37ad788f4ddd1dee9714 diff --git a/modules/Mvc b/modules/Mvc index 14429721d9..1ff5bdca79 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 14429721d933104e17bd5cae0b7f2399ca55ab2d +Subproject commit 1ff5bdca796d48293a42015d77528851684db669 diff --git a/modules/Security b/modules/Security index 90064ce9df..405e7bce54 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit 90064ce9dfc79d13058fbd6ec9092bf0f6124449 +Subproject commit 405e7bce54b021ee18070d3cf40b25d4dab27870 From 0f765534cb4d7626578c602cefc49096348441e3 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 23 Mar 2018 15:59:46 -0700 Subject: [PATCH 05/12] Remove duplicate copies of files from artifact output --- build/Publish.targets | 17 ++- build/repo.targets | 22 ++-- build/tasks/CheckExpectedPackagesExist.cs | 69 ++++++++++++ build/tasks/CopyPackagesToSplitFolders.cs | 116 --------------------- build/tasks/RepoTasks.tasks | 2 +- build/tasks/Utilities/PackageCategory.cs | 15 --- build/tasks/Utilities/PackageCollection.cs | 66 ------------ modules/DotNetTools | 2 +- modules/Scaffolding | 2 +- 9 files changed, 87 insertions(+), 224 deletions(-) create mode 100644 build/tasks/CheckExpectedPackagesExist.cs delete mode 100644 build/tasks/CopyPackagesToSplitFolders.cs delete mode 100644 build/tasks/Utilities/PackageCategory.cs delete mode 100644 build/tasks/Utilities/PackageCollection.cs diff --git a/build/Publish.targets b/build/Publish.targets index 2fbe87c07e..88c6ae41c0 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -13,7 +13,7 @@ ResolveCommitHash; PrepareOutputPaths; GetFilesToPublish; - CopyToPublishArtifacts; + PublishToLocalFolder; PublishToAzureFeed; PublishToTransportFeed; PublishToMyGet; @@ -47,7 +47,7 @@ Overwrite="true" /> - + - - - - - - + @@ -170,8 +163,10 @@ - + + + $(CleanDependsOn);CleanArtifacts;CleanUniverseArtifacts $(RestoreDependsOn);InstallDotNet $(CompileDependsOn);BuildRepositories - $(PackageDependsOn);BuildMetapackages;BuildTemplates;SplitPackages + $(PackageDependsOn);BuildMetapackages;BuildTemplates;CheckExpectedPackagesExist $(TestDependsOn);_TestRepositories $(VerifyDependsOn);VerifyCoherentVersions $(GetArtifactInfoDependsOn);ResolveRepoInfo;GetLineupPackageInfo @@ -164,18 +164,6 @@ - - - - - - - - @@ -212,6 +200,14 @@ ExternalDependencies="@(ExternalDependency);@(ShippedExternalDependency)" /> + + + + + + + + diff --git a/build/tasks/CheckExpectedPackagesExist.cs b/build/tasks/CheckExpectedPackagesExist.cs new file mode 100644 index 0000000000..0df55e5d47 --- /dev/null +++ b/build/tasks/CheckExpectedPackagesExist.cs @@ -0,0 +1,69 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using Microsoft.Build.Framework; +using NuGet.Packaging; +using NuGet.Packaging.Core; +using RepoTasks.Utilities; + +namespace RepoTasks +{ + public class CheckExpectedPackagesExist : Microsoft.Build.Utilities.Task + { + /// + /// The item group containing the nuget packages to split in different folders. + /// + [Required] + public ITaskItem[] Packages { get; set; } + + [Required] + public ITaskItem[] Files { get; set; } + + public override bool Execute() + { + if (Files?.Length == 0) + { + Log.LogError("No packages were found."); + return false; + } + + var expectedPackages = new HashSet(Packages.Select(i => i.ItemSpec), StringComparer.OrdinalIgnoreCase); + + foreach (var file in Files) + { + PackageIdentity identity; + using (var reader = new PackageArchiveReader(file.ItemSpec)) + { + identity = reader.GetIdentity(); + } + + if (!expectedPackages.Contains(identity.Id)) + { + Log.LogError($"Unexpected package artifact with id: {identity.Id}"); + continue; + } + + expectedPackages.Remove(identity.Id); + } + + if (expectedPackages.Count != 0) + { + var error = new StringBuilder(); + foreach (var id in expectedPackages) + { + error.Append(" - ").AppendLine(id); + } + + Log.LogError($"Expected the following packages, but they were not found:" + error.ToString()); + return false; + } + + return !Log.HasLoggedErrors; + } + } +} diff --git a/build/tasks/CopyPackagesToSplitFolders.cs b/build/tasks/CopyPackagesToSplitFolders.cs deleted file mode 100644 index 22f2f24df4..0000000000 --- a/build/tasks/CopyPackagesToSplitFolders.cs +++ /dev/null @@ -1,116 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.IO; -using System.Text; -using Microsoft.Build.Framework; -using NuGet.Packaging; -using NuGet.Packaging.Core; -using RepoTasks.Utilities; - -namespace RepoTasks -{ - public class CopyPackagesToSplitFolders : Microsoft.Build.Utilities.Task - { - /// - /// The item group containing the nuget packages to split in different folders. - /// - [Required] - public ITaskItem[] Packages { get; set; } - - [Required] - public ITaskItem[] Files { get; set; } - - /// - /// The folder where packages should be copied. Subfolders will be created based on package category. - /// - [Required] - public string DestinationFolder { get; set; } - - public bool Overwrite { get; set; } - - public override bool Execute() - { - if (Files?.Length == 0) - { - Log.LogError("No packages were found."); - return false; - } - - var expectedPackages = PackageCollection.FromItemGroup(Packages); - - Directory.CreateDirectory(DestinationFolder); - - foreach (var file in Files) - { - PackageIdentity identity; - using (var reader = new PackageArchiveReader(file.ItemSpec)) - { - identity = reader.GetIdentity(); - } - - var isSymbolsPackage = file.ItemSpec.EndsWith(".symbols.nupkg", StringComparison.OrdinalIgnoreCase); - PackageCategory category; - if (isSymbolsPackage) - { - category = PackageCategory.Symbols; - } - else if (!expectedPackages.TryGetCategory(identity.Id, out category)) - { - Log.LogError($"Unexpected package artifact with id: {identity.Id}"); - continue; - } - - string destDir; - switch (category) - { - case PackageCategory.Unknown: - throw new InvalidOperationException($"Package {identity} does not have a recognized package category."); - case PackageCategory.Shipping: - destDir = Path.Combine(DestinationFolder, "ship"); - break; - case PackageCategory.NoShip: - destDir = Path.Combine(DestinationFolder, "noship"); - break; - case PackageCategory.ShipOob: - destDir = Path.Combine(DestinationFolder, "shipoob"); - break; - case PackageCategory.Symbols: - destDir = Path.Combine(DestinationFolder, "symbols"); - break; - default: - throw new NotImplementedException(); - } - - Directory.CreateDirectory(destDir); - - var destFile = Path.Combine(destDir, Path.GetFileName(file.ItemSpec)); - - if (!Overwrite && File.Exists(destFile)) - { - Log.LogError($"File already exists in {destFile}"); - continue; - } - - Log.LogMessage($"Copying {file.ItemSpec} to {destFile}"); - File.Copy(file.ItemSpec, destFile, Overwrite); - expectedPackages.Remove(identity.Id); - } - - if (expectedPackages.Count != 0) - { - var error = new StringBuilder(); - foreach (var key in expectedPackages.Keys) - { - error.Append(" - ").AppendLine(key); - } - - Log.LogError($"Expected the following packages, but they were not found:" + error.ToString()); - return false; - } - - return !Log.HasLoggedErrors; - } - } -} diff --git a/build/tasks/RepoTasks.tasks b/build/tasks/RepoTasks.tasks index c91006135b..7e014a92a3 100644 --- a/build/tasks/RepoTasks.tasks +++ b/build/tasks/RepoTasks.tasks @@ -6,7 +6,7 @@ - + diff --git a/build/tasks/Utilities/PackageCategory.cs b/build/tasks/Utilities/PackageCategory.cs deleted file mode 100644 index 19a871d3b6..0000000000 --- a/build/tasks/Utilities/PackageCategory.cs +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - - -namespace RepoTasks.Utilities -{ - public enum PackageCategory - { - Unknown = 0, - Shipping, - NoShip, - ShipOob, - Symbols, - } -} diff --git a/build/tasks/Utilities/PackageCollection.cs b/build/tasks/Utilities/PackageCollection.cs deleted file mode 100644 index 4aa778aa2a..0000000000 --- a/build/tasks/Utilities/PackageCollection.cs +++ /dev/null @@ -1,66 +0,0 @@ -// Copyright (c) .NET Foundation. All rights reserved. -// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using Microsoft.Build.Framework; - -namespace RepoTasks.Utilities -{ - public class PackageCollection - { - private readonly IDictionary _packages = new Dictionary(StringComparer.OrdinalIgnoreCase); - - private PackageCollection() - { - } - - public bool TryGetCategory(string packageId, out PackageCategory category) => _packages.TryGetValue(packageId, out category); - - public void Remove(string packageId) => _packages.Remove(packageId); - - public int Count => _packages.Count; - - public IEnumerable Keys => _packages.Keys; - - public static PackageCollection FromItemGroup(ITaskItem[] items) - { - var list = new PackageCollection(); - if (items == null) - { - return list; - } - - foreach (var item in items) - { - PackageCategory category; - switch (item.GetMetadata("Category")?.ToLowerInvariant()) - { - case "ship": - category = PackageCategory.Shipping; - break; - case "noship": - category = PackageCategory.NoShip; - break; - case "shipoob": - category = PackageCategory.ShipOob; - break; - default: - category = PackageCategory.Unknown; - break; - } - - if (list._packages.ContainsKey(item.ItemSpec)) - { - throw new InvalidDataException($"Duplicate package id detected: {item.ItemSpec}"); - } - - list._packages.Add(item.ItemSpec, category); - } - - return list; - } - } -} diff --git a/modules/DotNetTools b/modules/DotNetTools index 39fc608adb..7e13e83348 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 39fc608adb59987e6a97f4d482a2544ebfda7924 +Subproject commit 7e13e83348bea331ee8943c6649b27a681e872af diff --git a/modules/Scaffolding b/modules/Scaffolding index 3b441e1709..18060e0ace 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 3b441e17095f34b80be53bee28729d2619cc461c +Subproject commit 18060e0ace1f643b57c49fd4fa2443dd14e006db From 97879e272638043a085fb5737c7b17d1c762195c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 23 Mar 2018 17:42:41 -0700 Subject: [PATCH 06/12] Updating submodule(s) Mvc => e94d77c47f15facd7e1394c942190cb9d49e2c59 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 1ff5bdca79..e94d77c47f 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 1ff5bdca796d48293a42015d77528851684db669 +Subproject commit e94d77c47f15facd7e1394c942190cb9d49e2c59 From 4060838db58e5593b03fbeb8eec7e023c44aa2e7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 23 Mar 2018 21:14:28 -0700 Subject: [PATCH 07/12] Updating submodule(s) Logging => d7002833566eed7747152d6ca7436ea029289ac7 [auto-updated: submodules] --- modules/Logging | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Logging b/modules/Logging index 753fb09563..d700283356 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 753fb09563bd757fcf9ef512ba867de31044dc99 +Subproject commit d7002833566eed7747152d6ca7436ea029289ac7 From 5c95c742e1d139446d646180f0e3beb9f2acdf03 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 24 Mar 2018 10:17:10 +0000 Subject: [PATCH 08/12] Updating submodule(s) KestrelHttpServer => 6701339835adfa1efd84eab6c696fea4e358c2a2 [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 63fd1e1a4d..6701339835 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 63fd1e1a4d2371778ff90a31632728efefe66cc9 +Subproject commit 6701339835adfa1efd84eab6c696fea4e358c2a2 From e7f3b186dce1087ae15f5b1ca75b90ac0f636913 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 24 Mar 2018 04:34:20 -0700 Subject: [PATCH 09/12] Updating submodule(s) SignalR => cb05ce4e0be445611e93ba02eff67f2d51b36474 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index a9667c3fbd..cb05ce4e0b 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit a9667c3fbdb29b7c118b70ab6a1c5296a0051291 +Subproject commit cb05ce4e0be445611e93ba02eff67f2d51b36474 From f4f99c4287892c53e345d59c7468c2b09b917e01 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 24 Mar 2018 17:50:17 -0700 Subject: [PATCH 10/12] Updating submodule(s) Templating => 1fe30aabbe9c596af40fed7af0a7957e7912df45 [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index e3894a4609..1fe30aabbe 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit e3894a460932c279011ac8faf3412ff287f32a7c +Subproject commit 1fe30aabbe9c596af40fed7af0a7957e7912df45 From 5eb7d9f74fa4cd2487b082b542cdb469b94287b4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 24 Mar 2018 18:39:00 -0700 Subject: [PATCH 11/12] Updating submodule(s) Mvc => 51784bb2d675149284cd5b6e30abc81bcb0891b4 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index e94d77c47f..51784bb2d6 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit e94d77c47f15facd7e1394c942190cb9d49e2c59 +Subproject commit 51784bb2d675149284cd5b6e30abc81bcb0891b4 From b3eab551c463be4f7dd744e9c6e335615aa76e97 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 25 Mar 2018 05:59:06 +0000 Subject: [PATCH 12/12] Updating submodule(s) SignalR => 4f5bc7046ebecf52b4ff81f088d6a311579f369f [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index cb05ce4e0b..4f5bc7046e 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit cb05ce4e0be445611e93ba02eff67f2d51b36474 +Subproject commit 4f5bc7046ebecf52b4ff81f088d6a311579f369f