From 7beaa5fe6e63d59bf14c6099a75f417d262b5432 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 19 Oct 2018 17:17:01 -0700 Subject: [PATCH 01/15] Updating submodule(s) Common => 7a2e64a64fa366abf887a50d2cb6f53476b12f2c Mvc => ddbe0fef2617f94a42312f002860f8f45145f11d SignalR => 95ccb1ee52f7336511e0eab54179b6d5e65a31e9 [auto-updated: submodules] --- modules/Common | 2 +- modules/Mvc | 2 +- modules/SignalR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Common b/modules/Common index 6c28ee81e0..7a2e64a64f 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 6c28ee81e0b95dfd4fe5208bc3d4301fcf6ddcb9 +Subproject commit 7a2e64a64fa366abf887a50d2cb6f53476b12f2c diff --git a/modules/Mvc b/modules/Mvc index 27e75e7a51..ddbe0fef26 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 27e75e7a5180c2ca0f4da9d2ef08740ded27cd0b +Subproject commit ddbe0fef2617f94a42312f002860f8f45145f11d diff --git a/modules/SignalR b/modules/SignalR index d82a3e6c99..95ccb1ee52 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit d82a3e6c99add110dcc1c64981f35bccf9746b1b +Subproject commit 95ccb1ee52f7336511e0eab54179b6d5e65a31e9 From 9b0e3ee805280e2daf25c34b419a0c0be6f2c9e8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 19 Oct 2018 17:17:09 -0700 Subject: [PATCH 02/15] Updating BuildTools from 2.2.0-preview2-20181019.4 to 2.2.0-preview2-20181019.5 [auto-updated: buildtools] --- global.json | 2 +- korebuild-lock.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index a97582a1fa..6a30267e95 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "2.2.100-preview3-009430" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181019.4" + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181019.5" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index d4dda4f177..e4dc6c0867 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181019.4 -commithash:b887cc1ace38ff792f2562aecbd7811b2bf1f3cc +version:2.2.0-preview2-20181019.5 +commithash:84a1c04b13bd7127728fee91989db8f2f58c8781 From b093146b5d7a194d98fcfedeb9140d93545998fd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 20 Oct 2018 19:04:56 +0000 Subject: [PATCH 03/15] Updating submodule(s) Routing => 3c9086e3d02acb34c21c1193f080be70e4f1cd6f [auto-updated: submodules] --- modules/Routing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Routing b/modules/Routing index 29b50c7b64..3c9086e3d0 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 29b50c7b64593557214e915b67dd67ae50388dd5 +Subproject commit 3c9086e3d02acb34c21c1193f080be70e4f1cd6f From e3aa8ae0cc69c50108efe742f3cbea8c3eb60a3a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 21 Oct 2018 00:05:15 -0700 Subject: [PATCH 04/15] Updating submodule(s) Routing => 42914d93ca8375ba089ee4ae5f1e48967f3b63f1 [auto-updated: submodules] --- modules/Routing | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Routing b/modules/Routing index 3c9086e3d0..42914d93ca 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 3c9086e3d02acb34c21c1193f080be70e4f1cd6f +Subproject commit 42914d93ca8375ba089ee4ae5f1e48967f3b63f1 From 2a49c13f99545905f2f055459cb62197205d0aca Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 21 Oct 2018 19:04:12 +0000 Subject: [PATCH 05/15] Updating submodule(s) EntityFrameworkCore => d578217479b3a09fc8f5639e19b618c80b1df6d3 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index bb7e7c4fa3..d578217479 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit bb7e7c4fa3f4c1831420c65e6212b787d084b1cb +Subproject commit d578217479b3a09fc8f5639e19b618c80b1df6d3 From 95777ace6b14e870b50f4e88427cacd6dc6bcd37 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 22 Oct 2018 07:04:41 +0000 Subject: [PATCH 06/15] Updating submodule(s) Diagnostics => b3db95eb2d099371a9d2fc1e4f8ee77b2a660eaf Mvc => 76a30b0911db8cc28371653582a7d485ba12b080 Routing => 1d05592cd73feb37d96169cfbf816c2a1e6f2dd8 [auto-updated: submodules] --- modules/Diagnostics | 2 +- modules/Mvc | 2 +- modules/Routing | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/Diagnostics b/modules/Diagnostics index f0994e5972..b3db95eb2d 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit f0994e5972a996507adfa66073887137b2511751 +Subproject commit b3db95eb2d099371a9d2fc1e4f8ee77b2a660eaf diff --git a/modules/Mvc b/modules/Mvc index ddbe0fef26..76a30b0911 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit ddbe0fef2617f94a42312f002860f8f45145f11d +Subproject commit 76a30b0911db8cc28371653582a7d485ba12b080 diff --git a/modules/Routing b/modules/Routing index 42914d93ca..1d05592cd7 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 42914d93ca8375ba089ee4ae5f1e48967f3b63f1 +Subproject commit 1d05592cd73feb37d96169cfbf816c2a1e6f2dd8 From abc2c27fd59c3cb6fec0768399f9d74b131ec3b9 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 22 Oct 2018 19:04:16 +0000 Subject: [PATCH 07/15] Updating submodule(s) EntityFrameworkCore => 4336e47abfdebaae26df3d9bf77c3cbe571bae14 HttpSysServer => 0a22b927b20d79177cf97e10111190ab812b98a7 IISIntegration => ffa72f5a0cb2a059ace96ac79a6811ffdc37d824 KestrelHttpServer => 2a610ee1b8d00eed8afe77252c966ecc1e695272 SignalR => 4a3d1c689f6586380d1a77c99103ea9ad76dec13 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/KestrelHttpServer | 2 +- modules/SignalR | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index d578217479..4336e47abf 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit d578217479b3a09fc8f5639e19b618c80b1df6d3 +Subproject commit 4336e47abfdebaae26df3d9bf77c3cbe571bae14 diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 30870b34c0..0a22b927b2 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 30870b34c0d0c2183f8c123ea4b1613078a0b6d7 +Subproject commit 0a22b927b20d79177cf97e10111190ab812b98a7 diff --git a/modules/IISIntegration b/modules/IISIntegration index f1ce94a2cf..ffa72f5a0c 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit f1ce94a2cf540eef4f5539539146a53c6a113769 +Subproject commit ffa72f5a0cb2a059ace96ac79a6811ffdc37d824 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 23a4e11261..2a610ee1b8 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 23a4e112613bc570ff859f9f70e3477a71565a1a +Subproject commit 2a610ee1b8d00eed8afe77252c966ecc1e695272 diff --git a/modules/SignalR b/modules/SignalR index 95ccb1ee52..4a3d1c689f 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 95ccb1ee52f7336511e0eab54179b6d5e65a31e9 +Subproject commit 4a3d1c689f6586380d1a77c99103ea9ad76dec13 From 14323b5dd51faa5bc7423fb5c8537b3851e9c4e1 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 22 Oct 2018 12:29:29 -0700 Subject: [PATCH 08/15] Delete CODEOWNERS --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) delete mode 100644 .github/CODEOWNERS diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS deleted file mode 100644 index 8c310020d9..0000000000 --- a/.github/CODEOWNERS +++ /dev/null @@ -1 +0,0 @@ -* @natemcmaster @JunTaoLuo From b623b9912e97e22fa182507d19591a6a1a5c4f7c Mon Sep 17 00:00:00 2001 From: Smit Patel Date: Mon, 22 Oct 2018 12:02:23 -0700 Subject: [PATCH 09/15] Make EFCore.Cosmos no-ship package Fixes https://github.com/aspnet/EntityFrameworkCore/issues/13670 --- build/artifacts.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/artifacts.props b/build/artifacts.props index 4f3960a46d..8d364a1c24 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -188,7 +188,7 @@ - + From c8b68c062203ad792b383c261ba7b7c45505fdaf Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 23 Oct 2018 07:04:43 +0000 Subject: [PATCH 10/15] Updating submodule(s) EntityFrameworkCore => fc2374a5cdfbd13821aa1e8a93a220a945f9584c IISIntegration => 61f1a70784dc0a32cf98f8ddd169c0293b0390ab Logging => b90c3bf4deb7485ac90105df489019f6a5c707ac Mvc => 40959a97e78488133824807c683d16301eab4c79 Routing => bd32ec38375263f6b1a77a1a0757c032d8f0f2b3 SignalR => 2bea4608fac6f3fa599e7f7da8502012ff313f5d Templating => 707b1bbf3ba009c4e8e1c4198ee5a724fc9c26f4 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/Logging | 2 +- modules/Mvc | 2 +- modules/Routing | 2 +- modules/SignalR | 2 +- modules/Templating | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 4336e47abf..fc2374a5cd 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 4336e47abfdebaae26df3d9bf77c3cbe571bae14 +Subproject commit fc2374a5cdfbd13821aa1e8a93a220a945f9584c diff --git a/modules/IISIntegration b/modules/IISIntegration index ffa72f5a0c..61f1a70784 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit ffa72f5a0cb2a059ace96ac79a6811ffdc37d824 +Subproject commit 61f1a70784dc0a32cf98f8ddd169c0293b0390ab diff --git a/modules/Logging b/modules/Logging index e30f23cd3e..b90c3bf4de 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit e30f23cd3ef5ecc41f36b9690f837e9bcdea4da5 +Subproject commit b90c3bf4deb7485ac90105df489019f6a5c707ac diff --git a/modules/Mvc b/modules/Mvc index 76a30b0911..40959a97e7 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 76a30b0911db8cc28371653582a7d485ba12b080 +Subproject commit 40959a97e78488133824807c683d16301eab4c79 diff --git a/modules/Routing b/modules/Routing index 1d05592cd7..bd32ec3837 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 1d05592cd73feb37d96169cfbf816c2a1e6f2dd8 +Subproject commit bd32ec38375263f6b1a77a1a0757c032d8f0f2b3 diff --git a/modules/SignalR b/modules/SignalR index 4a3d1c689f..2bea4608fa 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 4a3d1c689f6586380d1a77c99103ea9ad76dec13 +Subproject commit 2bea4608fac6f3fa599e7f7da8502012ff313f5d diff --git a/modules/Templating b/modules/Templating index 80d3bbfcc9..707b1bbf3b 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 80d3bbfcc9e94c0950734af0fe71ea284b3a148c +Subproject commit 707b1bbf3ba009c4e8e1c4198ee5a724fc9c26f4 From 0e8e7867c1a0f19f20bb3abc51a6aa9d393660a3 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 23 Oct 2018 19:04:15 +0000 Subject: [PATCH 11/15] Updating submodule(s) Common => 143250eedb219d4ea93fcfd4d66474e5a04ae9c4 EntityFrameworkCore => c724cee4f56f21db5037c06634320d7fcab40fb7 IISIntegration => 3842779379a0ef4c995dc120709e53b02661899f KestrelHttpServer => 32532078d6cdb1933fc55986a292f27be5645f43 SignalR => f7d10bec0273b1282ac02798e453a38bcde3f7ed [auto-updated: submodules] --- modules/Common | 2 +- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/KestrelHttpServer | 2 +- modules/SignalR | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/modules/Common b/modules/Common index 7a2e64a64f..143250eedb 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 7a2e64a64fa366abf887a50d2cb6f53476b12f2c +Subproject commit 143250eedb219d4ea93fcfd4d66474e5a04ae9c4 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index fc2374a5cd..c724cee4f5 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit fc2374a5cdfbd13821aa1e8a93a220a945f9584c +Subproject commit c724cee4f56f21db5037c06634320d7fcab40fb7 diff --git a/modules/IISIntegration b/modules/IISIntegration index 61f1a70784..3842779379 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 61f1a70784dc0a32cf98f8ddd169c0293b0390ab +Subproject commit 3842779379a0ef4c995dc120709e53b02661899f diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 2a610ee1b8..32532078d6 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 2a610ee1b8d00eed8afe77252c966ecc1e695272 +Subproject commit 32532078d6cdb1933fc55986a292f27be5645f43 diff --git a/modules/SignalR b/modules/SignalR index 2bea4608fa..f7d10bec02 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 2bea4608fac6f3fa599e7f7da8502012ff313f5d +Subproject commit f7d10bec0273b1282ac02798e453a38bcde3f7ed From bc8984dfeabd4cce9ae283a768629cfb4ac1ba86 Mon Sep 17 00:00:00 2001 From: dotnet-maestro-bot Date: Tue, 23 Oct 2018 13:36:09 -0700 Subject: [PATCH 12/15] Upgrade to .NET Core 2.2.0-rtm-27023-02 --- build/dependencies.props | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index c3da1b887e..f2b4376caf 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,10 +1,10 @@ - + - 2.2.0-preview3-27014-02 - 2.2.0-preview3-27014-02 - 4.6.0-preview3-27014-02 + 2.2.0-rtm-27023-02 + 2.2.0-rtm-27023-02 + 4.6.0-rtm-27023-03 From 935df249c4a8bf14b98237e3f22f7127f991cf35 Mon Sep 17 00:00:00 2001 From: Pavel Krymets Date: Tue, 23 Oct 2018 16:27:23 -0700 Subject: [PATCH 13/15] Shorten siteextension version to fit into 20 chars (#3707) --- .azure/pipelines/site-extensions.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.azure/pipelines/site-extensions.yml b/.azure/pipelines/site-extensions.yml index 69924ca3c1..84a4b2f0d8 100644 --- a/.azure/pipelines/site-extensions.yml +++ b/.azure/pipelines/site-extensions.yml @@ -3,6 +3,8 @@ trigger: include: - release/2.2 +name: $(Date:yyMMdd)-$(Rev:rr) + phases: - phase: SiteExtensions variables: From 9df348a171a64bb05907a8c8023323dedc7e6e24 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 24 Oct 2018 12:04:23 -0700 Subject: [PATCH 14/15] Updating submodule(s) BasicMiddleware => 2d3ad1cb0f9872da40c6d143ce4554563971ae04 EntityFrameworkCore => ec2d9b9992df41da8731cd4cb5f8e46189be1409 IISIntegration => 5c3017524f8f59d0b205d20104ead3cdb2723436 KestrelHttpServer => a8073167e7adcca0d6708d4da56e43066535e3a5 Logging => 2e30d867a412cd7b543f7ec0ed3932be0d08b8e3 Mvc => 2544926b2fc9231fa508070291eb9dc5bf2d58df Routing => 577be72faa07367669842d09147f3f14bb528d31 SignalR => 29c06e26369766f92a40f3f8bbe6e876ad20563e StaticFiles => a5fcd9dd8724eb71f0642340f68aeb85b0473374 Templating => 70a786adcdca3d7880e81b3e6a2aafcab0db072c [auto-updated: submodules] --- modules/BasicMiddleware | 2 +- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/KestrelHttpServer | 2 +- modules/Logging | 2 +- modules/Mvc | 2 +- modules/Routing | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index c21cee940a..2d3ad1cb0f 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit c21cee940aa2458c514fd94ccaa247f2f7853b78 +Subproject commit 2d3ad1cb0f9872da40c6d143ce4554563971ae04 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index c724cee4f5..ec2d9b9992 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit c724cee4f56f21db5037c06634320d7fcab40fb7 +Subproject commit ec2d9b9992df41da8731cd4cb5f8e46189be1409 diff --git a/modules/IISIntegration b/modules/IISIntegration index 3842779379..5c3017524f 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 3842779379a0ef4c995dc120709e53b02661899f +Subproject commit 5c3017524f8f59d0b205d20104ead3cdb2723436 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 32532078d6..a8073167e7 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 32532078d6cdb1933fc55986a292f27be5645f43 +Subproject commit a8073167e7adcca0d6708d4da56e43066535e3a5 diff --git a/modules/Logging b/modules/Logging index b90c3bf4de..2e30d867a4 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit b90c3bf4deb7485ac90105df489019f6a5c707ac +Subproject commit 2e30d867a412cd7b543f7ec0ed3932be0d08b8e3 diff --git a/modules/Mvc b/modules/Mvc index 40959a97e7..2544926b2f 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 40959a97e78488133824807c683d16301eab4c79 +Subproject commit 2544926b2fc9231fa508070291eb9dc5bf2d58df diff --git a/modules/Routing b/modules/Routing index bd32ec3837..577be72faa 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit bd32ec38375263f6b1a77a1a0757c032d8f0f2b3 +Subproject commit 577be72faa07367669842d09147f3f14bb528d31 diff --git a/modules/SignalR b/modules/SignalR index f7d10bec02..29c06e2636 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit f7d10bec0273b1282ac02798e453a38bcde3f7ed +Subproject commit 29c06e26369766f92a40f3f8bbe6e876ad20563e diff --git a/modules/StaticFiles b/modules/StaticFiles index a43587290f..a5fcd9dd87 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit a43587290fecff5a1229d8cb7f26603c01c7ab1d +Subproject commit a5fcd9dd8724eb71f0642340f68aeb85b0473374 diff --git a/modules/Templating b/modules/Templating index 707b1bbf3b..70a786adcd 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 707b1bbf3ba009c4e8e1c4198ee5a724fc9c26f4 +Subproject commit 70a786adcdca3d7880e81b3e6a2aafcab0db072c From 37915c9b58540079f464e944c95d157c52674cf0 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 24 Oct 2018 12:38:03 -0700 Subject: [PATCH 15/15] Remove the aspnet/Common git submodule (#3715) As a part of merging and reducing the number of repos we use, the aspnet/Common repo was renamed to aspnet/Extensions and it now builds on its own and not as a submodule of this repo. --- .gitmodules | 4 ---- build/artifacts.props | 22 ----------------- build/buildorder.props | 1 - build/dependencies.props | 23 ++++++++++++++++++ build/external-dependencies.props | 40 +++++++++++++++++++++++++++++++ build/submodules.props | 1 - modules/Common | 1 - 7 files changed, 63 insertions(+), 29 deletions(-) delete mode 160000 modules/Common diff --git a/.gitmodules b/.gitmodules index 219a68ff6f..a9651ed372 100644 --- a/.gitmodules +++ b/.gitmodules @@ -26,10 +26,6 @@ path = modules/Caching url = https://github.com/aspnet/Caching.git branch = release/2.2 -[submodule "modules/Common"] - path = modules/Common - url = https://github.com/aspnet/Common.git - branch = release/2.2 [submodule "modules/Configuration"] path = modules/Configuration url = https://github.com/aspnet/Configuration.git diff --git a/build/artifacts.props b/build/artifacts.props index 8d364a1c24..79e1a2579b 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -25,12 +25,10 @@ - - @@ -55,9 +53,7 @@ - - @@ -173,7 +169,6 @@ - @@ -212,8 +207,6 @@ - - @@ -226,7 +219,6 @@ - @@ -239,7 +231,6 @@ - @@ -259,23 +250,10 @@ - - - - - - - - - - - - - diff --git a/build/buildorder.props b/build/buildorder.props index f40a356312..05aba60937 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/dependencies.props b/build/dependencies.props index f2b4376caf..8bd8ba4adb 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,6 +5,29 @@ 2.2.0-rtm-27023-02 2.2.0-rtm-27023-02 4.6.0-rtm-27023-03 + + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 + 2.2.0-rtm-35542 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index f5e24cf2a1..532e2c37a0 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -10,9 +10,49 @@ false + + + + + + + false + + false + true + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/submodules.props b/build/submodules.props index a772043618..b1d54c7c93 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/modules/Common b/modules/Common deleted file mode 160000 index 143250eedb..0000000000 --- a/modules/Common +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 143250eedb219d4ea93fcfd4d66474e5a04ae9c4