From afc5b9fb61d89e5f7cf4419b297e5430c021d25f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 5 Feb 2018 11:06:51 -0800 Subject: [PATCH 1/7] Updating submodule(s) Templating => fe3e420e0e7127909d8da5be641f9c4bbc7bb0ec [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index 216e9f62c4..fe3e420e0e 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 216e9f62c4f375e15e4a78cbb6aecf0d91850106 +Subproject commit fe3e420e0e7127909d8da5be641f9c4bbc7bb0ec From 1d24f18c7c66539a621775fff1cb115659da2329 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 5 Feb 2018 12:54:24 -0800 Subject: [PATCH 2/7] Updating submodule(s) AzureIntegration => 32659f2f00ee79b7379102f0f85e25f17ae0be22 [auto-updated: submodules] --- modules/AzureIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 9645612ae3..32659f2f00 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 9645612ae3b5770cc54661b9d2587382aa2b79cf +Subproject commit 32659f2f00ee79b7379102f0f85e25f17ae0be22 From b06e3f37250a568f45cb45f1d19046bb7c541672 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 5 Feb 2018 16:00:30 -0800 Subject: [PATCH 3/7] Revert "Include Microsoft.AspNetCore.App in the LZMA" This reverts commit f35d96b0dbd300e750cd9071ef6d29af07825fb2. --- build/artifacts.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/artifacts.props b/build/artifacts.props index 9fd0624246..6c1bad7f21 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -29,7 +29,7 @@ - + From 711436b7a1792137f6715ae49d8b4428705b246d Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 5 Feb 2018 14:12:14 -0800 Subject: [PATCH 4/7] Notify which package is missing --- build/tasks/AddArchiveReferences.cs | 41 +++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 8 deletions(-) diff --git a/build/tasks/AddArchiveReferences.cs b/build/tasks/AddArchiveReferences.cs index 12367cf835..063ee5d68d 100644 --- a/build/tasks/AddArchiveReferences.cs +++ b/build/tasks/AddArchiveReferences.cs @@ -52,12 +52,27 @@ namespace RepoTasks foreach (var package in archiveArtifacts) { var packageName = package.ItemSpec; - 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(); + string packageVersion; + + if(string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase)) + { + packageVersion = MetaPackageVersion; + } + else + { + try + { + packageVersion = buildArtifacts + .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) + .PackageInfo.Version.ToString(); + } + catch (InvalidOperationException) + { + Log.LogError($"Missing Package: {packageName} from artifacts archive."); + throw; + } + } Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersion}"); var packageReferenceElement = xmlDoc.CreateElement("PackageReference"); @@ -83,9 +98,19 @@ namespace RepoTasks foreach (var package in archiveTools) { var packageName = package.ItemSpec; - var packageVersion = buildArtifacts - .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) - .PackageInfo.Version.ToString(); + + string packageVersion; + + try{ + packageVersion = buildArtifacts + .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) + .PackageInfo.Version.ToString(); + } + catch(InvalidOperationException) + { + Log.LogError($"Missing Package: {packageName} from tools archive."); + throw; + } Log.LogMessage(MessageImportance.High, $" - Tool: {packageName} Version: {packageVersion}"); From 28d340e8f8b4d8b6fa170808ea35279b19780ffd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 6 Feb 2018 01:24:45 +0000 Subject: [PATCH 5/7] Updating BuildTools from 2.1.0-preview1-1012 to 2.1.0-preview1-1013 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index bc9c05011f..b790abdc1b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1012 -commithash:692d90ec605e64b329e04480d81d3a551536973b +version:2.1.0-preview1-1013 +commithash:3546d8149fb5a0f0b6d0be234ce893f87f967345 From 0f9d1f13ed5265ea75644283ca1c8ee44deebfc3 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Mon, 5 Feb 2018 12:48:22 -0800 Subject: [PATCH 6/7] Publish symbol packages to transport feed --- build/Publish.targets | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build/Publish.targets b/build/Publish.targets index 1c8cb52bed..37a6a8ff2b 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -3,6 +3,7 @@ $(RepositoryRoot).deps\assets\ $(RepositoryRoot).deps\packages\ + $(RepositoryRoot).deps\symbols\ aspnetcore_base_runtime.version $(IntermediateDir)$(BaseRuntimeVersionFileName) @@ -73,6 +74,8 @@ ShipInstaller=dotnetcli + + $(BlobBasePath)$(PackageArchiveFileName) From 0ec2bd4e76e399c88722a8e6430975f598146723 Mon Sep 17 00:00:00 2001 From: = Date: Mon, 5 Feb 2018 16:18:03 -0800 Subject: [PATCH 7/7] Add .App to LZMA - Use metapackage version for .App in archiver project --- build/artifacts.props | 2 +- build/repo.targets | 1 + build/tasks/AddArchiveReferences.cs | 40 +++++++++++++++++------------ 3 files changed, 25 insertions(+), 18 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index 6c1bad7f21..9fd0624246 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -29,7 +29,7 @@ - + diff --git a/build/repo.targets b/build/repo.targets index df1859dd07..bd7246818c 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -93,6 +93,7 @@ <_LineupPackages Include="@(ExternalDependency)" /> <_LineupPackages Include="%(ArtifactInfo.PackageId)" Version="%(ArtifactInfo.Version)" Condition=" '%(ArtifactInfo.ArtifactType)' == 'NuGetPackage' " /> <_LineupPackages Include="Microsoft.AspNetCore.All" Version="$(PackageVersion)" /> + <_LineupPackages Include="Microsoft.AspNetCore.App" Version="$(PackageVersion)" /> <_RestoreSources Include="$(DotNetAdditionalRestoreSources)" Condition="'$(DotNetAdditionalRestoreSources)' != ''" /> <_RestoreSources Include="$(DependencyPackageDir)" Condition="'$(DependencyPackageDir)' != '' AND Exists('$(DependencyPackageDir)')" /> diff --git a/build/tasks/AddArchiveReferences.cs b/build/tasks/AddArchiveReferences.cs index 063ee5d68d..a912e965f7 100644 --- a/build/tasks/AddArchiveReferences.cs +++ b/build/tasks/AddArchiveReferences.cs @@ -55,23 +55,27 @@ namespace RepoTasks string packageVersion; - if(string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase)) + if (string.Equals(packageName, "Microsoft.AspNetCore.All", StringComparison.OrdinalIgnoreCase) + || string.Equals(packageName, "Microsoft.AspNetCore.App", StringComparison.OrdinalIgnoreCase)) { packageVersion = MetaPackageVersion; } else { - try - { - packageVersion = buildArtifacts - .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) - .PackageInfo.Version.ToString(); - } - catch (InvalidOperationException) + var packageVersionCandidates = buildArtifacts.Where(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)); + + if (!packageVersionCandidates.Any()) { Log.LogError($"Missing Package: {packageName} from artifacts archive."); - throw; + return false; } + else if (packageVersionCandidates.Count() > 1) + { + Log.LogError($"Duplicate Packages: {packageName} from artifacts archive."); + return false; + } + + packageVersion = packageVersionCandidates.Single().PackageInfo.Version.ToString(); } Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersion}"); @@ -99,18 +103,20 @@ namespace RepoTasks { var packageName = package.ItemSpec; - string packageVersion; + var packageVersionCandidates = buildArtifacts.Where(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)); - try{ - packageVersion = buildArtifacts - .Single(p => string.Equals(p.PackageInfo.Id, packageName, StringComparison.OrdinalIgnoreCase)) - .PackageInfo.Version.ToString(); - } - catch(InvalidOperationException) + if (!packageVersionCandidates.Any()) { Log.LogError($"Missing Package: {packageName} from tools archive."); - throw; + return false; } + else if (packageVersionCandidates.Count() > 1) + { + Log.LogError($"Duplicate Packages: {packageName} from tools archive."); + return false; + } + + var packageVersion = packageVersionCandidates.Single().PackageInfo.Version.ToString(); Log.LogMessage(MessageImportance.High, $" - Tool: {packageName} Version: {packageVersion}");