From 6b92579bede91156c467712aa253fab439ab22ac Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 16:36:40 +0000 Subject: [PATCH 01/13] Updating submodule(s) Identity => 042b6ecaf2b2d7757ac45bf962a933e4c65ecc7c [auto-updated: submodules] --- modules/Identity | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Identity b/modules/Identity index 646e65cb1d..042b6ecaf2 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 646e65cb1db34e9d02e305d952e19565391c87a1 +Subproject commit 042b6ecaf2b2d7757ac45bf962a933e4c65ecc7c From 587fa32677f9cfe2b191d3335fc716852205d841 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 00:30:26 +0000 Subject: [PATCH 02/13] Updating submodule(s) KestrelHttpServer => f91ae20a3c6310ce9af1fe576249915b51c6d0ba Logging => 2ff997f71ad72420fa5a162e57483cd163008124 [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- modules/Logging | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index b3f9f38ac6..f91ae20a3c 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit b3f9f38ac6200193ae7f018ca1a7d8af4006b870 +Subproject commit f91ae20a3c6310ce9af1fe576249915b51c6d0ba diff --git a/modules/Logging b/modules/Logging index 89f85d4a62..2ff997f71a 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 89f85d4a6283a52ffd506ac794c4e6cbaaff982a +Subproject commit 2ff997f71ad72420fa5a162e57483cd163008124 From b6470e2483faef04e04b89dfa6dfbf072da3e089 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 15:26:11 +0000 Subject: [PATCH 03/13] Updating submodule(s) Hosting => e30ae8cc3dbe4e59ae999a870c99c7cda9898f77 [auto-updated: submodules] --- modules/Hosting | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Hosting b/modules/Hosting index 52c7f5fb98..e30ae8cc3d 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 52c7f5fb98b0fd32495854e4f1f4eaf21d67ed71 +Subproject commit e30ae8cc3dbe4e59ae999a870c99c7cda9898f77 From b5cd1234894e5cbd5a15589441f5a05c50337633 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 09:31:25 -0700 Subject: [PATCH 04/13] Updating submodule(s) EntityFrameworkCore => 39acb62595ba64347e68ac986d55040ddd496395 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 914357eb62..39acb62595 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 914357eb62e434be250f3a4f22d3b8a5a080f1a4 +Subproject commit 39acb62595ba64347e68ac986d55040ddd496395 From 37e95432d3c461b7b320ba3d5a4e1dc57f0b1527 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 17:56:15 +0000 Subject: [PATCH 05/13] Updating submodule(s) KestrelHttpServer => e9eea50966ff8bd8bcae304c107f90c9022e9e57 SignalR => 7f6dd893dd2d9f84b873fb4ee6a94c290c16c265 [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- modules/SignalR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index f91ae20a3c..e9eea50966 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit f91ae20a3c6310ce9af1fe576249915b51c6d0ba +Subproject commit e9eea50966ff8bd8bcae304c107f90c9022e9e57 diff --git a/modules/SignalR b/modules/SignalR index 2ccf79a912..7f6dd893dd 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 2ccf79a91244b9137742055b7b6345076a378743 +Subproject commit 7f6dd893dd2d9f84b873fb4ee6a94c290c16c265 From 548eb520cd83fd1e8baa411871cf0df5ad305037 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 11:09:32 -0700 Subject: [PATCH 06/13] Updating submodule(s) Common => 343ae77b2bf5a9be53ea8af185e6af663ea207dd [auto-updated: submodules] --- modules/Common | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Common b/modules/Common index b93e18b0a2..343ae77b2b 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit b93e18b0a263739d8cc10a7724f558ea022100d1 +Subproject commit 343ae77b2bf5a9be53ea8af185e6af663ea207dd From a2c171ceb6da764dc485723cb93985440a260533 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 18:59:05 +0000 Subject: [PATCH 07/13] Updating submodule(s) CORS => 6f76189846214f7a5e863e19c29c8acfb79bd5fa EntityFrameworkCore => bf2b3a773155a5dfedff7d6eafe2f46a3bd86f48 [auto-updated: submodules] --- modules/CORS | 2 +- modules/EntityFrameworkCore | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/CORS b/modules/CORS index e8caccf009..6f76189846 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit e8caccf009c24a846382ebb2abb1bc578973ff0c +Subproject commit 6f76189846214f7a5e863e19c29c8acfb79bd5fa diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 39acb62595..bf2b3a7731 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 39acb62595ba64347e68ac986d55040ddd496395 +Subproject commit bf2b3a773155a5dfedff7d6eafe2f46a3bd86f48 From 3d1e677bdf4f7a2807be1a5bc72858ed23445743 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 19:38:37 +0000 Subject: [PATCH 08/13] Updating submodule(s) Identity => 2327d6ae44d553d26743825c6087c0460388f5ab MetaPackages => 96be626c87c3ca325b18aa6653602f5e7087497f [auto-updated: submodules] --- modules/Identity | 2 +- modules/MetaPackages | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Identity b/modules/Identity index 042b6ecaf2..2327d6ae44 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 042b6ecaf2b2d7757ac45bf962a933e4c65ecc7c +Subproject commit 2327d6ae44d553d26743825c6087c0460388f5ab diff --git a/modules/MetaPackages b/modules/MetaPackages index f20e2f82aa..96be626c87 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit f20e2f82aaa3717e97fc109cf7427c259dfb34cf +Subproject commit 96be626c87c3ca325b18aa6653602f5e7087497f From 630f3ba90d9d11de05592b3a7ec46c51ad599c5c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 20:03:25 +0000 Subject: [PATCH 09/13] Updating submodule(s) Common => 519bdbd0b358fbdc6282a77c2d532cbfee4e409b HttpAbstractions => 89b0430bdad0f0ddb253ae699ea6b37e7108e89b Identity => dd9873b9d072b278b536d6cfbc0a1fcd71a04c91 MetaPackages => ee52ff2dc9dc941968631440707d22f6961be178 [auto-updated: submodules] --- modules/Common | 2 +- modules/HttpAbstractions | 2 +- modules/Identity | 2 +- modules/MetaPackages | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/modules/Common b/modules/Common index 3ca8a17fd3..519bdbd0b3 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 3ca8a17fd379b2bd4e1d6a923ddbedce744406df +Subproject commit 519bdbd0b358fbdc6282a77c2d532cbfee4e409b diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 30172616ed..89b0430bda 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 30172616ed57f17c5bcf31e7f021914cb4d27e78 +Subproject commit 89b0430bdad0f0ddb253ae699ea6b37e7108e89b diff --git a/modules/Identity b/modules/Identity index 4ce1928a4c..dd9873b9d0 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 4ce1928a4c819b12d4be5d2cdff85fc912fc4ab4 +Subproject commit dd9873b9d072b278b536d6cfbc0a1fcd71a04c91 diff --git a/modules/MetaPackages b/modules/MetaPackages index a3cb22f171..ee52ff2dc9 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit a3cb22f171d6c5c19c4d64953fb8f842941e87e7 +Subproject commit ee52ff2dc9dc941968631440707d22f6961be178 From 1be826a4b128ad992be72352884a6f1c7ebec3fb Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 21:05:24 +0000 Subject: [PATCH 10/13] Updating submodule(s) EntityFrameworkCore => 3d34c7bc71837658eeacada382567a7430869c5e [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index bf2b3a7731..3d34c7bc71 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit bf2b3a773155a5dfedff7d6eafe2f46a3bd86f48 +Subproject commit 3d34c7bc71837658eeacada382567a7430869c5e From 8c10337b64e6032d9181de986cf9f0edfdb3de9e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 15:27:42 -0700 Subject: [PATCH 11/13] Updating submodule(s) EntityFrameworkCore => 2f8ad9f7e49d83abad71f1b2229acc5a446265dc KestrelHttpServer => daf6e1ecd77410808cf01083b174ddbd5b9e88fa SignalR => d1829b24915ccbe8d74f59f99877b79926471cfe [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/KestrelHttpServer | 2 +- modules/SignalR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 3d34c7bc71..2f8ad9f7e4 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 3d34c7bc71837658eeacada382567a7430869c5e +Subproject commit 2f8ad9f7e49d83abad71f1b2229acc5a446265dc diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index e9eea50966..daf6e1ecd7 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit e9eea50966ff8bd8bcae304c107f90c9022e9e57 +Subproject commit daf6e1ecd77410808cf01083b174ddbd5b9e88fa diff --git a/modules/SignalR b/modules/SignalR index 7f6dd893dd..d1829b2491 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 7f6dd893dd2d9f84b873fb4ee6a94c290c16c265 +Subproject commit d1829b24915ccbe8d74f59f99877b79926471cfe From 6dbc38fd76c3df30e4ada3e9eae3f24655bf2583 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 5 Oct 2018 23:31:30 +0000 Subject: [PATCH 12/13] Updating submodule(s) KestrelHttpServer => 5b90028fe370c68e93fb20153880bd97cce1905d [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index daf6e1ecd7..5b90028fe3 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit daf6e1ecd77410808cf01083b174ddbd5b9e88fa +Subproject commit 5b90028fe370c68e93fb20153880bd97cce1905d From 36e462d6f25a5c34509d211fd5cc228c83e4cc60 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 5 Oct 2018 16:50:15 -0700 Subject: [PATCH 13/13] Update branding to 2.1.6-servicing (#1455) Cleanup the implementation of version.props to make it clearer what the rules are for appending version suffixes, applying updates, etc. --- build/repo.targets | 2 +- version.props | 50 +++++++++++++++++++++++++++------------------- 2 files changed, 30 insertions(+), 22 deletions(-) diff --git a/build/repo.targets b/build/repo.targets index 507dcaa1c0..bba113bb1c 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -158,7 +158,7 @@ $(AspNetCoreMajorVersion) $(AspNetCoreMinorVersion) $(AspNetCorePatchVersion) - $(PrereleaseVersionLabel) + $(PreReleaseLabel) $(BuildNumber) $(PackageBrandingVersion) diff --git a/version.props b/version.props index bede325a3e..c0217598a3 100644 --- a/version.props +++ b/version.props @@ -3,35 +3,43 @@ 2 1 6 - $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) - rtm + servicing + Servicing t000 - - - $(VersionPrefix) - + $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) 0.1.$(AspNetCorePatchVersion) - rtm + $(PreReleaseLabel)-$(BuildNumber) + $(PreReleaseBrandingLabel) Build $(BuildNumber) - $(PrereleaseVersionLabel) - $(PackageVersionSuffix)-$(BuildNumber) - $(PrereleaseVersionLabel)-final - + + false + true + false + + $(VersionPrefix) + $(PackageBrandingVersion) $(BrandingVersionSuffix) + + $(VersionPrefix) - $(VersionPrefix)-$(PackageVersionSuffix) + $(VersionPrefix)-$(VersionSuffix) + + + $(ExperimentalVersionPrefix) + $(ExperimentalVersionPrefix)-$(VersionSuffix) - pb-$(DotNetProductBuildId) - $(PrereleaseVersionLabel) - $(VersionSuffix)-$(BuildNumber) - $(VersionSuffix)+$(VersionMetadata) + $(VersionSuffix)+$(VersionMetadata) - $(ExperimentalVersionPrefix) - $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final - $(ExperimentalVersionSuffix)-$(BuildNumber) - - release/2.1 + release/$(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion) + + + + + + + +