From 2f85e4a36dd6ca4096af4debbd34be17353c0b04 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 8 Aug 2018 09:25:40 -0700 Subject: [PATCH 01/10] Add a restore feed for 2.1.3 packages --- build/sources.props | 1 + 1 file changed, 1 insertion(+) diff --git a/build/sources.props b/build/sources.props index 5b458ddf09..3910dce755 100644 --- a/build/sources.props +++ b/build/sources.props @@ -11,6 +11,7 @@ $(RestoreSources); https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; https://api.nuget.org/v3/index.json; + https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180725-02/final/index.json; $(RestoreSources); From 3f55bf3cfb42d5e576cc0d64dfffd02c1a3c5026 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 8 Aug 2018 16:35:32 +0000 Subject: [PATCH 02/10] Make System.IO.Pipelines a direct dependency of Microsoft.AspNetCore.App This is required for servicing this shared framework assembly independently of the aspnet packages which use it. --- 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 - - - - - - - From e7447ca3603a3570e7ff0ad599e8265c65eecf47 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 8 Aug 2018 11:03:27 -0700 Subject: [PATCH 03/10] Consume a new version of System.IO.Pipelines from ProdCon --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 94e140d721..6e01dca07a 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,6 +4,7 @@ 2.1.3-servicing-26722-02 2.1.3-servicing-26722-02 + 4.5.0 @@ -110,7 +111,6 @@ 4.5.0 5.2.0 3.1.1 - 4.5.0 4.5.1 4.3.2 4.5.0 From ade48333e63b08e25e2f8f51552a4bccc82be73c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 7 Sep 2018 19:08:31 +0000 Subject: [PATCH 04/10] Updating submodule(s) KestrelHttpServer => 2f3b56540152cc57e3ed3130f1982608f3648506 [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 85bf01da82..2f3b565401 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 85bf01da82a2e6fd20c7dd3b9693468fcb2552e2 +Subproject commit 2f3b56540152cc57e3ed3130f1982608f3648506 From e643ff191918d94a170900999e22d099166ed3ef Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 10 Sep 2018 15:14:17 -0700 Subject: [PATCH 05/10] Updating submodule(s) SignalR => 399ac267ca30c2f95f6925011defb57385a048b1 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 753c3da852..399ac267ca 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 753c3da852028df97087c7e30ec40dc87892530b +Subproject commit 399ac267ca30c2f95f6925011defb57385a048b1 From 4d637de70d8242a63e5e2868aa1542c9de2d3eae Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 11 Sep 2018 10:45:52 -0700 Subject: [PATCH 06/10] Fix merge error --- build/dependencies.props | 5 ----- 1 file changed, 5 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 4f714281ef..e20c21fa29 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -2,13 +2,8 @@ -<<<<<<< HEAD 2.1.5-servicing-26906-03 2.1.5-servicing-26906-03 -======= - 2.1.3-servicing-26722-02 - 2.1.3-servicing-26722-02 ->>>>>>> 51103305aa59c4cf84a1cf5327db2f96fdbe479c From b0ed2fa0903f5d47c49e9ce4ec9a7b7c1a1bd9d8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 11 Sep 2018 15:35:06 -0700 Subject: [PATCH 07/10] Updating submodule(s) KestrelHttpServer => e5b2b680e07ec6142bfd0f2ca39592f1acf85b2f [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 2f3b565401..e5b2b680e0 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 2f3b56540152cc57e3ed3130f1982608f3648506 +Subproject commit e5b2b680e07ec6142bfd0f2ca39592f1acf85b2f From e91ec4b2715ff703be193a3eb66290f3298d02ff Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 11 Sep 2018 16:09:45 -0700 Subject: [PATCH 08/10] Updating submodule(s) EntityFrameworkCore => 7b11733e091e937ea6f616ecf56ebc6fcb11955f [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index ce5940319c..7b11733e09 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit ce5940319ce43409946348e747bfd1a6eded5e3d +Subproject commit 7b11733e091e937ea6f616ecf56ebc6fcb11955f From 5f19d3dafa83d6c3be3f5efbcdee01b954de55e3 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 13 Sep 2018 12:48:00 -0700 Subject: [PATCH 09/10] Updating submodule(s) SignalR => 8a8d1e7d0a3e95f8d8cd5f504591538ca7366068 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 399ac267ca..8a8d1e7d0a 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 399ac267ca30c2f95f6925011defb57385a048b1 +Subproject commit 8a8d1e7d0a3e95f8d8cd5f504591538ca7366068 From 3952845c576f9955046b9145b70b571e4780c2d4 Mon Sep 17 00:00:00 2001 From: Matt Mitchell Date: Fri, 14 Sep 2018 13:10:09 -0700 Subject: [PATCH 10/10] Unpin package versions for 2.1.5 --- build/dependencies.props | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index e20c21fa29..4e317c2070 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -4,6 +4,12 @@ 2.1.5-servicing-26906-03 2.1.5-servicing-26906-03 + 4.5.0 + 4.5.1 + 4.5.0 + 4.5.1 + 4.5.1 + 4.5.0 @@ -106,25 +112,19 @@ 1.5.0 4.5.0 4.5.1 - 4.5.0 4.5.0 5.2.0 3.1.1 - 4.5.1 4.5.1 4.3.2 - 4.5.0 - 4.5.1 4.5.0 3.1.1 4.3.0 1.6.0 - 4.5.1 4.3.0 4.5.0 4.5.0 4.5.0 - 4.5.0 4.5.0 4.5.0 4.5.0