From d59551bc8aa7b553fd97b63469c11c882a688884 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 4 Sep 2018 21:03:43 +0000 Subject: [PATCH 1/3] Updating submodule(s) SignalR => 753c3da852028df97087c7e30ec40dc87892530b [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 04c606d55f..753c3da852 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 04c606d55f8dc62c2965223b261cb2c4392c4ceb +Subproject commit 753c3da852028df97087c7e30ec40dc87892530b From 19eff3f83e990930bd5ef22c86eb1c646ea5fbe8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 4 Sep 2018 21:22:51 +0000 Subject: [PATCH 2/3] Updating submodule(s) IISIntegration => b5ff991eb95c71915aff1eb6283388dc02e9c67e [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 922298bc90..b5ff991eb9 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 922298bc902e4deccd766c0e3bed84b3b3e40b74 +Subproject commit b5ff991eb95c71915aff1eb6283388dc02e9c67e From e9b0415bb9ba704a9ae9408142beea4eddeda678 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 5 Sep 2018 15:20:11 -0700 Subject: [PATCH 3/3] Make System.IO.Pipelines a direct dependency of Microsoft.AspNetCore.App --- build/external-dependencies.props | 2 +- build/tasks/AddMetapackageReferences.cs | 5 ++++- build/tools/templates/Archive/Archive.csproj | 14 -------------- 3 files changed, 5 insertions(+), 16 deletions(-) delete mode 100644 build/tools/templates/Archive/Archive.csproj diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f0261d2212..8f8858d98c 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -129,7 +129,7 @@ - + diff --git a/build/tasks/AddMetapackageReferences.cs b/build/tasks/AddMetapackageReferences.cs index 57a9675061..3cb11666ab 100644 --- a/build/tasks/AddMetapackageReferences.cs +++ b/build/tasks/AddMetapackageReferences.cs @@ -89,7 +89,10 @@ namespace RepoTasks continue; } - var packageVersionValue = GetDependencyVersion(dependencyVersionType, packageName, packageVersion); + var packageVersionValue = + Enum.TryParse(package.GetMetadata("MetapackageVersionRangeType"), out var packageVersionType) + ? GetDependencyVersion(packageVersionType, packageName, packageVersion) + : GetDependencyVersion(dependencyVersionType, packageName, packageVersion); Log.LogMessage(MessageImportance.High, $" - Package: {packageName} Version: {packageVersionValue}"); diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj deleted file mode 100644 index e2843be0e0..0000000000 --- a/build/tools/templates/Archive/Archive.csproj +++ /dev/null @@ -1,14 +0,0 @@ - - - - netcoreapp2.1 - false - true - true - - - - - - -