From b4946fc6381607c2de42431123cf98de42c7208e Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 17 Apr 2018 12:16:10 -0700 Subject: [PATCH 01/10] Bring modules back to release/2.1 versions --- modules/AADIntegration | 2 +- modules/Antiforgery | 2 +- modules/AuthSamples | 2 +- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/BrowserLink | 2 +- modules/CORS | 2 +- modules/Caching | 2 +- modules/Common | 2 +- modules/Configuration | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/Diagnostics | 2 +- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/EventNotification | 2 +- modules/FileSystem | 2 +- modules/Hosting | 2 +- modules/HtmlAbstractions | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Localization | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Microsoft.Data.Sqlite | 2 +- modules/MusicStore | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Options | 2 +- modules/Proxy | 2 +- modules/Razor | 2 +- modules/ResponseCaching | 2 +- modules/Routing | 2 +- modules/Scaffolding | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- modules/Testing | 2 +- modules/WebHooks | 2 +- modules/WebSockets | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/modules/AADIntegration b/modules/AADIntegration index 353f8554a9..6ee08a985d 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit 353f8554a9bf6120f74f0eb03247104fd734dbd2 +Subproject commit 6ee08a985d83952aed34f4da8badc40c219ca0f0 diff --git a/modules/Antiforgery b/modules/Antiforgery index 7e1c2d8cb2..7627df6bdc 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 7e1c2d8cb2ba66efbcab7c01529476fccf4debb8 +Subproject commit 7627df6bdc3f87026b3f180152f0613de4cfa1c4 diff --git a/modules/AuthSamples b/modules/AuthSamples index 07fb470c3c..5246efbf8e 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit 07fb470c3c55d27288740f43c275da8e82c9b29e +Subproject commit 5246efbf8eef14e9c7764c7b81df448be8a3804a diff --git a/modules/AzureIntegration b/modules/AzureIntegration index e77be23e2b..2a64c1953d 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit e77be23e2b07437bd9473821804178afe3f8aa19 +Subproject commit 2a64c1953da8d851df5c688e614bcd185c7fc052 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index cd3e968d16..6a20718bf4 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit cd3e968d163966a1d71c36ea366d1f0587e073e9 +Subproject commit 6a20718bf4dbd4ef8bd200926f996b0d88e338d7 diff --git a/modules/BrowserLink b/modules/BrowserLink index 7c1721c38c..de5e2584e8 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit 7c1721c38caa05fc574b2d2ff778508afcec819a +Subproject commit de5e2584e8a9ada2f5344036e31ec5ed4dbd9934 diff --git a/modules/CORS b/modules/CORS index af6f10030c..195b378bcb 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit af6f10030cf47d6d9af88e16fb93bddf51defd4f +Subproject commit 195b378bcb2a7b6d424703169b34ff8a4198af6b diff --git a/modules/Caching b/modules/Caching index 3b0e3fa503..d280fe601a 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit 3b0e3fa503fe6ec32fc433e441a890be4a4736c2 +Subproject commit d280fe601a3a3edc1da143415d07cdb031eee4c8 diff --git a/modules/Common b/modules/Common index 268a25ba1b..fc1620fe68 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 268a25ba1b85e99bbcc6bcc9133198c5c8fdfa39 +Subproject commit fc1620fe684e9720f1c4ea47052cbf0ef5826016 diff --git a/modules/Configuration b/modules/Configuration index ec35b4b7ef..8cd41f583f 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit ec35b4b7ef3929685ef4860c8e36a4e677e878ae +Subproject commit 8cd41f583f13ebfa02b65c0cbab426a19f8a5ffd diff --git a/modules/DataProtection b/modules/DataProtection index 3c40b9efd2..db71d243d5 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit 3c40b9efd2c82fbee205332f04cce4b1f982157c +Subproject commit db71d243d50fd2d26a415b1140c64ecb04338af3 diff --git a/modules/DependencyInjection b/modules/DependencyInjection index aad8d7a682..ef28775c2d 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit aad8d7a682d0156e93f1789213afa123d9858429 +Subproject commit ef28775c2d2602b17f9668b02dd66b7e86877514 diff --git a/modules/Diagnostics b/modules/Diagnostics index 3acf82e5f8..4ef2bc2e91 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 3acf82e5f8314be58bb2dfd45c28d86e51ff303e +Subproject commit 4ef2bc2e916117b765d03a86c8f88555532166ad diff --git a/modules/DotNetTools b/modules/DotNetTools index 5f9e708089..9b5015d6fe 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 5f9e70808902b074301166aacee7419804314002 +Subproject commit 9b5015d6fee90cc77c9130d3faf7904bcdd36ed6 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index bb01aeab99..be80ab089a 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit bb01aeab99cc8f03feae90b6431fc5a7b50bb149 +Subproject commit be80ab089a7165f93c984552a22a41b398868693 diff --git a/modules/EventNotification b/modules/EventNotification index 1327a2773a..de56b17e3b 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit 1327a2773a61e92ebdcf9e1b7f55c6e56b238f5a +Subproject commit de56b17e3bd4a9f60539545b8d81f9187da4e486 diff --git a/modules/FileSystem b/modules/FileSystem index 50d78868bf..a590a7e347 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 50d78868bf89a9c74176ee8271e0755937a0dd68 +Subproject commit a590a7e347bba3c351f79b5abc29c0bd0f715a16 diff --git a/modules/Hosting b/modules/Hosting index a997ceba98..6e957e436a 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit a997ceba98c40a98d2fd48190cba6d12abf105e7 +Subproject commit 6e957e436a02642266241e2799aaf5c60e84541a diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index f9a0a9e646..00d5959323 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit f9a0a9e646594d4cb574e261b2aaab5dab8ed05d +Subproject commit 00d595932354b96431e6684b49c3b436bae08e20 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 5d1ee9da82..b97e40ff7d 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 5d1ee9da82ecd3eac6b57771b52ac00918138767 +Subproject commit b97e40ff7dde747a743fe6eea818c8061aa06541 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index 703ab19818..f07ebbf0f9 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit 703ab198180e9ab35e466cbe1f2a4d56b1d3be4a +Subproject commit f07ebbf0f9b4177eef33f67890ac3b19c21d89ee diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 8b5053957e..988972e1e5 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 8b5053957efce4a79fa5bceeaed311d37bc7dc6e +Subproject commit 988972e1e5c920e199b4ede7dff5f867b502234d diff --git a/modules/IISIntegration b/modules/IISIntegration index 8e15e40d2b..7e0c5813e8 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 8e15e40d2b84e9c9a71f52b4c759375420945638 +Subproject commit 7e0c5813e8a8ee0dc271a34d43356a1e3a4434a7 diff --git a/modules/Identity b/modules/Identity index 985c8a8b07..034e2ad188 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 985c8a8b07b5b31f92c72a6324744b9761930120 +Subproject commit 034e2ad18865158de7aeb2353c89f9b2dd9af0ef diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 2c81117b4b..f22297a4db 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 2c81117b4b92ca03b59a182fd7c09300575a4fdd +Subproject commit f22297a4db3d62c8c0bdbfca575f8115004855a5 diff --git a/modules/JsonPatch b/modules/JsonPatch index 75839f4951..fc1b2ab548 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit 75839f4951e0bdc5235391795fa0b75f4af23b8c +Subproject commit fc1b2ab5489337be36e56b86b3ab7cf71f6596f2 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 6fd09af374..9ea2c50068 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 6fd09af3742ea07c63894ec512cafabbca1a5d68 +Subproject commit 9ea2c50068c77978f0df7b3c58368167503dfa50 diff --git a/modules/Localization b/modules/Localization index 7cec5ccd48..7d89ed61cd 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit 7cec5ccd48608b890ac012ea148f914e063d6eea +Subproject commit 7d89ed61cd081aefcec49eee8f36e1edfab9f585 diff --git a/modules/Logging b/modules/Logging index 3821274d6c..d4588d07e6 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 3821274d6ca48e97d447e27a5239d2357256c331 +Subproject commit d4588d07e61534ef9d6bdb06fd7320c619500e68 diff --git a/modules/MetaPackages b/modules/MetaPackages index 5d612380e6..3235adf61a 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 5d612380e6b05cffdeb448b2dd9d0388d771034e +Subproject commit 3235adf61ad3e4ed2b02ee7c09ce0e60d52a2e5f diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index e9358df697..2b9f77f914 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit e9358df6978aaea4f3ef01be0d94c7e877787960 +Subproject commit 2b9f77f914c70f37add0a5cdea641bce4ec42db7 diff --git a/modules/MusicStore b/modules/MusicStore index 43cb563f7b..fce76da097 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit 43cb563f7beb88ae3f3ef884ea968502e52d3569 +Subproject commit fce76da0970add3f9cbad40dea959f4fb7916960 diff --git a/modules/Mvc b/modules/Mvc index d8fc2d4009..5e019bd707 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit d8fc2d4009e343065d3d0e15f748846db80e231a +Subproject commit 5e019bd707497b0d28a7387c7ed66447a1907d59 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 92886f592a..83ebebcabc 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 92886f592aa6700bc7e03beb728487f83268b608 +Subproject commit 83ebebcabc90783c7b45b006fd5b2a0ca3e62edc diff --git a/modules/Options b/modules/Options index bba46a679f..6d17b061e4 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit bba46a679f203728db7e32b2b1bb5f6ef1859ef4 +Subproject commit 6d17b061e4e61e73225eb013a8d15432f8cc2068 diff --git a/modules/Proxy b/modules/Proxy index 13caad9f7a..eaa1388581 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit 13caad9f7a8f06b68be06bc6bc62efcfa86fa226 +Subproject commit eaa1388581931dfa3c7b530a50c9344b5126fa81 diff --git a/modules/Razor b/modules/Razor index d16c9a5ba4..b1007744b0 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit d16c9a5ba44001fe04f56dbb584a23679d761820 +Subproject commit b1007744b00ce094af080602ee26d3887a786d56 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index afc2c83e6c..7865e2d4bd 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit afc2c83e6c5080becdb36c73b3b73f2ed014a774 +Subproject commit 7865e2d4bdbf4a7fed690e2e4c8ba8597380d743 diff --git a/modules/Routing b/modules/Routing index c8d842c160..f0e88ede96 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit c8d842c160a8b64c21685ba8fb68661f98a86004 +Subproject commit f0e88ede96dc6b8fd54d4b36d2333d7e152d2079 diff --git a/modules/Scaffolding b/modules/Scaffolding index d9767b5682..49af135e4c 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit d9767b5682fdfc1a1cf439811f6062db9629bad0 +Subproject commit 49af135e4cbe059de495505de4d81d9cc1de3de6 diff --git a/modules/Security b/modules/Security index 0778f5467a..0d0f703e3e 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit 0778f5467ab9853bf697b8c0c98db6d9a38e3617 +Subproject commit 0d0f703e3e074fe60b8e9fc3846ce03547022305 diff --git a/modules/ServerTests b/modules/ServerTests index a43546674c..02ebb4fc64 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit a43546674c4eaea3807977a961610097854506e9 +Subproject commit 02ebb4fc6429eb6b55571e297061902d20a85bae diff --git a/modules/Session b/modules/Session index 1cc3bb8a85..b77b9b10da 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit 1cc3bb8a85d376be04cbb241303e25420041b805 +Subproject commit b77b9b10dad00b78dab0437a3a2f95b042c951dc diff --git a/modules/SignalR b/modules/SignalR index c05c5a6b2a..1c7ca7fa3a 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit c05c5a6b2a005a8601b43ea83448148a5ba9511c +Subproject commit 1c7ca7fa3a1d17551ff26bd33a2f3705989fe6f4 diff --git a/modules/StaticFiles b/modules/StaticFiles index 52c45f2204..b900f1ccf1 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 52c45f22045f775585078aa59291aef408b80dcc +Subproject commit b900f1ccf1738e68154bc9d39682050c176bdae9 diff --git a/modules/Templating b/modules/Templating index 2850064c36..4236f0e51c 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 2850064c3643d013d40d1e1b13c8237a28d1fdb7 +Subproject commit 4236f0e51c6bc5672987a9e5f63acd6652ae2536 diff --git a/modules/Testing b/modules/Testing index e7abaf7ad4..00aed18940 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit e7abaf7ad48592b48aa0afb844c8903492948cfc +Subproject commit 00aed1894099699ea063424ec69fed1ae4b04be6 diff --git a/modules/WebHooks b/modules/WebHooks index 57601858b1..5da0e4e035 160000 --- a/modules/WebHooks +++ b/modules/WebHooks @@ -1 +1 @@ -Subproject commit 57601858b1ab5fc0b735417b12970f55003b62e2 +Subproject commit 5da0e4e03526006f64f15e338d3f6671621526da diff --git a/modules/WebSockets b/modules/WebSockets index 2ef84e6b9a..c222a398db 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit 2ef84e6b9ae03a0d229e0c3af5e141189feda539 +Subproject commit c222a398dbaea64012573abdcf6374813aa880da From a32e7dc18b7956d5c6eb51fe0c69f62f02ce9ec1 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 17 Apr 2018 12:24:03 -0700 Subject: [PATCH 02/10] Adapt dev to release/2.1 --- .gitmodules | 98 +++++++++++++++++++++++----------------------- korebuild-lock.txt | 4 +- korebuild.json | 4 +- version.props | 11 +++--- 4 files changed, 58 insertions(+), 59 deletions(-) diff --git a/.gitmodules b/.gitmodules index d68d5beff2..f46e4e64ce 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,196 +1,196 @@ [submodule "modules/AADIntegration"] path = modules/AADIntegration url = https://github.com/aspnet/AADIntegration.git - branch = dev + branch = release/2.1 [submodule "modules/Antiforgery"] path = modules/Antiforgery url = https://github.com/aspnet/Antiforgery.git - branch = dev + branch = release/2.1 [submodule "modules/AuthSamples"] path = modules/AuthSamples url = https://github.com/aspnet/AuthSamples.git - branch = dev + branch = release/2.1 [submodule "modules/AzureIntegration"] path = modules/AzureIntegration url = https://github.com/aspnet/AzureIntegration.git - branch = dev + branch = release/2.1 [submodule "modules/BasicMiddleware"] path = modules/BasicMiddleware url = https://github.com/aspnet/BasicMiddleware.git - branch = dev + branch = release/2.1 [submodule "modules/BrowserLink"] path = modules/BrowserLink url = https://github.com/aspnet/BrowserLink.git - branch = dev + branch = release/2.1 [submodule "modules/Caching"] path = modules/Caching url = https://github.com/aspnet/Caching.git - branch = dev + branch = release/2.1 [submodule "modules/Common"] path = modules/Common url = https://github.com/aspnet/Common.git - branch = dev + branch = release/2.1 [submodule "modules/Configuration"] path = modules/Configuration url = https://github.com/aspnet/Configuration.git - branch = dev + branch = release/2.1 [submodule "modules/CORS"] path = modules/CORS url = https://github.com/aspnet/CORS.git - branch = dev + branch = release/2.1 [submodule "modules/DataProtection"] path = modules/DataProtection url = https://github.com/aspnet/DataProtection.git - branch = dev + branch = release/2.1 [submodule "modules/DependencyInjection"] path = modules/DependencyInjection url = https://github.com/aspnet/DependencyInjection.git - branch = dev + branch = release/2.1 [submodule "modules/Diagnostics"] path = modules/Diagnostics url = https://github.com/aspnet/Diagnostics.git - branch = dev + branch = release/2.1 [submodule "modules/DotNetTools"] path = modules/DotNetTools url = https://github.com/aspnet/DotNetTools.git - branch = dev + branch = release/2.1 [submodule "modules/EntityFrameworkCore"] path = modules/EntityFrameworkCore url = https://github.com/aspnet/EntityFrameworkCore.git - branch = dev + branch = release/2.1 [submodule "modules/EventNotification"] path = modules/EventNotification url = https://github.com/aspnet/EventNotification.git - branch = dev + branch = release/2.1 [submodule "modules/FileSystem"] path = modules/FileSystem url = https://github.com/aspnet/FileSystem.git - branch = dev + branch = release/2.1 [submodule "modules/Hosting"] path = modules/Hosting url = https://github.com/aspnet/Hosting.git - branch = dev + branch = release/2.1 [submodule "modules/HtmlAbstractions"] path = modules/HtmlAbstractions url = https://github.com/aspnet/HtmlAbstractions.git - branch = dev + branch = release/2.1 [submodule "modules/HttpAbstractions"] path = modules/HttpAbstractions url = https://github.com/aspnet/HttpAbstractions.git - branch = dev + branch = release/2.1 [submodule "modules/HttpClientFactory"] path = modules/HttpClientFactory url = https://github.com/aspnet/HttpClientFactory.git - branch = dev + branch = release/2.1 [submodule "modules/HttpSysServer"] path = modules/HttpSysServer url = https://github.com/aspnet/HttpSysServer.git - branch = dev + branch = release/2.1 [submodule "modules/Identity"] path = modules/Identity url = https://github.com/aspnet/Identity.git - branch = dev + branch = release/2.1 [submodule "modules/IISIntegration"] path = modules/IISIntegration url = https://github.com/aspnet/IISIntegration.git - branch = dev + branch = release/2.1 [submodule "modules/JavaScriptServices"] path = modules/JavaScriptServices url = https://github.com/aspnet/JavaScriptServices.git - branch = dev + branch = release/2.1 [submodule "modules/JsonPatch"] path = modules/JsonPatch url = https://github.com/aspnet/JsonPatch.git - branch = dev + branch = release/2.1 [submodule "modules/KestrelHttpServer"] path = modules/KestrelHttpServer url = https://github.com/aspnet/KestrelHttpServer.git - branch = dev + branch = release/2.1 [submodule "modules/Localization"] path = modules/Localization url = https://github.com/aspnet/Localization.git - branch = dev + branch = release/2.1 [submodule "modules/Logging"] path = modules/Logging url = https://github.com/aspnet/Logging.git - branch = dev + branch = release/2.1 [submodule "modules/MetaPackages"] path = modules/MetaPackages url = https://github.com/aspnet/MetaPackages.git - branch = dev + branch = release/2.1 [submodule "modules/Microsoft.Data.Sqlite"] path = modules/Microsoft.Data.Sqlite url = https://github.com/aspnet/Microsoft.Data.Sqlite.git - branch = dev + branch = release/2.1 [submodule "modules/MusicStore"] path = modules/MusicStore url = https://github.com/aspnet/MusicStore.git - branch = dev + branch = release/2.1 [submodule "modules/Mvc"] path = modules/Mvc url = https://github.com/aspnet/Mvc.git - branch = dev + branch = release/2.1 [submodule "modules/MvcPrecompilation"] path = modules/MvcPrecompilation url = https://github.com/aspnet/MvcPrecompilation.git - branch = dev + branch = release/2.1 [submodule "modules/Options"] path = modules/Options url = https://github.com/aspnet/Options.git - branch = dev + branch = release/2.1 [submodule "modules/Proxy"] path = modules/Proxy url = https://github.com/aspnet/Proxy.git - branch = dev + branch = release/2.1 [submodule "modules/Razor"] path = modules/Razor url = https://github.com/aspnet/Razor.git - branch = dev + branch = release/2.1 [submodule "modules/ResponseCaching"] path = modules/ResponseCaching url = https://github.com/aspnet/ResponseCaching.git - branch = dev + branch = release/2.1 [submodule "modules/Routing"] path = modules/Routing url = https://github.com/aspnet/Routing.git - branch = dev + branch = release/2.1 [submodule "modules/Scaffolding"] path = modules/Scaffolding url = https://github.com/aspnet/Scaffolding.git - branch = dev + branch = release/2.1 [submodule "modules/Security"] path = modules/Security url = https://github.com/aspnet/Security.git - branch = dev + branch = release/2.1 [submodule "modules/ServerTests"] path = modules/ServerTests url = https://github.com/aspnet/ServerTests.git - branch = dev + branch = release/2.1 [submodule "modules/Session"] path = modules/Session url = https://github.com/aspnet/Session.git - branch = dev + branch = release/2.1 [submodule "modules/SignalR"] path = modules/SignalR url = https://github.com/aspnet/SignalR.git - branch = dev + branch = release/2.1 [submodule "modules/StaticFiles"] path = modules/StaticFiles url = https://github.com/aspnet/StaticFiles.git - branch = dev + branch = release/2.1 [submodule "modules/Templating"] path = modules/Templating url = https://github.com/aspnet/Templating.git - branch = dev + branch = release/2.1 [submodule "modules/Testing"] path = modules/Testing url = https://github.com/aspnet/Testing.git - branch = dev + branch = release/2.1 [submodule "modules/WebSockets"] path = modules/WebSockets url = https://github.com/aspnet/WebSockets.git - branch = dev + branch = release/2.1 [submodule "modules/WebHooks"] path = modules/WebHooks url = https://github.com/aspnet/WebHooks.git - branch = dev + branch = release/2.1 diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 9508be6972..a6327f8728 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview3-17032 -commithash:d3d9c5682617da4d0a69372aae5d736ed733d156 +version:2.1.0-rc1-15770 +commithash:a2abdc6fa0e8a1a465e830100950f1ecc698ab28 diff --git a/korebuild.json b/korebuild.json index a7d496a8ad..7e75ef053a 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,6 +1,6 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", - "channel": "dev", + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", + "channel": "release/2.1", "toolsets": { "nodejs": { "minVersion": "8.0", diff --git a/version.props b/version.props index ed17da3f3f..7c8a108995 100644 --- a/version.props +++ b/version.props @@ -1,10 +1,10 @@ - 2.2.0 - preview1 + 2.1.0 + rc1 - 0.2.0 - alpha1 + 0.1.0 + alpha2 $(VersionPrefix) @@ -23,8 +23,7 @@ $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final $(ExperimentalVersionSuffix)-$(BuildNumber) - - master + release/2.1 From 9f6531b547f12e02aa06198323466865f3868c17 Mon Sep 17 00:00:00 2001 From: Ryan Brandenburg Date: Tue, 17 Apr 2018 12:26:08 -0700 Subject: [PATCH 03/10] Fix script target --- scripts/UpdateDependenciesCoreFx.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/UpdateDependenciesCoreFx.ps1 b/scripts/UpdateDependenciesCoreFx.ps1 index 1256092da2..28db0aa6ec 100644 --- a/scripts/UpdateDependenciesCoreFx.ps1 +++ b/scripts/UpdateDependenciesCoreFx.ps1 @@ -103,7 +103,7 @@ Write-Host "Loading deps from $depsPath" [xml] $dependencies = LoadXml $depsPath $remote = "origin" -$baseBranch = "dev" +$baseBranch = "release/2.1" $currentBranch = Invoke-Block { & git rev-parse --abbrev-ref HEAD } $destinationBranch = "rybrande/UpgradeDepsTest" From 3a95662f52e3dc922b28744af9519965f86dd6bc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 17 Apr 2018 14:06:54 -0700 Subject: [PATCH 04/10] Updating submodule(s) AADIntegration => be1337c73eab49e385b93d37eb6aa2f4fa1540da Antiforgery => 2843f8cfc5bceafe6c17f7054b218bbdf255d210 AuthSamples => 41ad654a2650352e2d75a422d305becd6111d295 AzureIntegration => 0cb45afdaaaed25a7fe250d3e03bd6dcb4553fc5 BasicMiddleware => f9619367fc989a02f640388c70db8fd5e68e6721 BrowserLink => ee68c6ae8cd2fbd0c189bcb2099d9a10257c75ac Caching => 08266190ce3a1c6821bcd08c433959ddd3c18300 Common => 3bd7db49aecd435bf958d2952f4cd3f91ed13115 Configuration => 645b8237533e5152f19798a55d1ebf7f927b32ee CORS => 8ee8c842880224492a9111585f8339f490d39595 DataProtection => ba3cf559bd5beb03d78293744a6f7474cacde7cb DependencyInjection => aaab2f53c44a066611ec90a7514f6dcb26fbbbf1 Diagnostics => 89b25723dbd31c87d23438a763552d56a0a861eb DotNetTools => 3385cfea1b33f0d1f74b0d312b75b4aad969620c EntityFrameworkCore => 818a210c444ef5d886460cbd9c4117620939f1f2 EventNotification => 46ff2a47a41fd265669f3cfcca2d4742266eca69 FileSystem => 2ce0323e3df2f94352c6f28c895a6a617827b49e Hosting => 7644204569148b688f54d31613d4a0c3bd0a3673 HtmlAbstractions => 6c2432e5448fc71889e374fee3f6c7472c18628a HttpAbstractions => e7055a11aec055799a49032635a2d4f0a9a5bb76 HttpClientFactory => 3fc98d44ca3e35508903bcf6729c047b5418b556 HttpSysServer => 6ce8b74ea4a59a33e3a5c08bf45f86a2456da64b Identity => 9b2a7d35f4b73e5e2ba842b9ec11212491c9d2af IISIntegration => 03c5357ee2082cf2d912bc31d8ed54687a4e01c2 JavaScriptServices => 8ddacb8b73962f3bb2bbdf6345f37ff28d6fc2e4 JsonPatch => 40d5c7f839f86a927bd39777e8b4198aafc098ee KestrelHttpServer => 9662e2bd015b0884aff7882f8214da61e2e53715 Localization => 979c8f01e01877b4eeb1a6c79eaac1a199bbfd5f Logging => b2c4d45da6603279aad4064d32d1c1daef1749e7 MetaPackages => 750fd873d172b382ef53a4146872688044fcb2c7 Microsoft.Data.Sqlite => 466a4802116ae581a9a6947c03889e4d59836a6f MusicStore => 23d79555178057757b2c6c3e8ba134cffd3bd498 Mvc => e781cd38cffaaf9f9b851f6cd301212d5acf97c9 MvcPrecompilation => f08b4a7b0b07130de9334f0c818e81eb406bd100 Options => 22d2d52a3047706537064124283fd4159c92033a Proxy => 10420007ce449eb33d76cd8452cd681018c502df Razor => dc997821ccd7b74c658b845aabff9a6e40a3bcd5 ResponseCaching => 532af71577408c42b197b3f294c447470406ba4b Routing => f4e57be5758b6079582919b431aa0d7e538938d4 Scaffolding => b0eec6c5a823e7f2d9a8c9f91105b315e832b1d8 Security => 30493e2fd63907d0484b940c069d681dcb962591 ServerTests => da33bd257a7fd9737331fed33919e146d8b02061 Session => a9f6f3bb3d0e84c8c88816f6cdb08fa7554de183 SignalR => 31debcbf9f7a2906f9b8f75676319ec51b2dd379 StaticFiles => bf0e4f8fb5c4b0d56c70d42895a173f99ab149a0 Templating => 718989b820e44c86c42f5cb796faa61f54604020 Testing => 807e41b008c9797c737649964f63c08d40063ce4 WebHooks => eecaac30c56c49db22124667fa28170d34df577e WebSockets => 07dddce092708a216350aa6a7e95c104a3d03756 [auto-updated: submodules] --- modules/AADIntegration | 2 +- modules/Antiforgery | 2 +- modules/AuthSamples | 2 +- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/BrowserLink | 2 +- modules/CORS | 2 +- modules/Caching | 2 +- modules/Common | 2 +- modules/Configuration | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/Diagnostics | 2 +- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/EventNotification | 2 +- modules/FileSystem | 2 +- modules/Hosting | 2 +- modules/HtmlAbstractions | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Localization | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Microsoft.Data.Sqlite | 2 +- modules/MusicStore | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Options | 2 +- modules/Proxy | 2 +- modules/Razor | 2 +- modules/ResponseCaching | 2 +- modules/Routing | 2 +- modules/Scaffolding | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- modules/Testing | 2 +- modules/WebHooks | 2 +- modules/WebSockets | 2 +- 49 files changed, 49 insertions(+), 49 deletions(-) diff --git a/modules/AADIntegration b/modules/AADIntegration index 6ee08a985d..be1337c73e 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit 6ee08a985d83952aed34f4da8badc40c219ca0f0 +Subproject commit be1337c73eab49e385b93d37eb6aa2f4fa1540da diff --git a/modules/Antiforgery b/modules/Antiforgery index 7627df6bdc..2843f8cfc5 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 7627df6bdc3f87026b3f180152f0613de4cfa1c4 +Subproject commit 2843f8cfc5bceafe6c17f7054b218bbdf255d210 diff --git a/modules/AuthSamples b/modules/AuthSamples index 5246efbf8e..41ad654a26 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit 5246efbf8eef14e9c7764c7b81df448be8a3804a +Subproject commit 41ad654a2650352e2d75a422d305becd6111d295 diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 2a64c1953d..0cb45afdaa 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 2a64c1953da8d851df5c688e614bcd185c7fc052 +Subproject commit 0cb45afdaaaed25a7fe250d3e03bd6dcb4553fc5 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 6a20718bf4..f9619367fc 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 6a20718bf4dbd4ef8bd200926f996b0d88e338d7 +Subproject commit f9619367fc989a02f640388c70db8fd5e68e6721 diff --git a/modules/BrowserLink b/modules/BrowserLink index de5e2584e8..ee68c6ae8c 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit de5e2584e8a9ada2f5344036e31ec5ed4dbd9934 +Subproject commit ee68c6ae8cd2fbd0c189bcb2099d9a10257c75ac diff --git a/modules/CORS b/modules/CORS index 195b378bcb..8ee8c84288 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 195b378bcb2a7b6d424703169b34ff8a4198af6b +Subproject commit 8ee8c842880224492a9111585f8339f490d39595 diff --git a/modules/Caching b/modules/Caching index d280fe601a..08266190ce 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit d280fe601a3a3edc1da143415d07cdb031eee4c8 +Subproject commit 08266190ce3a1c6821bcd08c433959ddd3c18300 diff --git a/modules/Common b/modules/Common index fc1620fe68..3bd7db49ae 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit fc1620fe684e9720f1c4ea47052cbf0ef5826016 +Subproject commit 3bd7db49aecd435bf958d2952f4cd3f91ed13115 diff --git a/modules/Configuration b/modules/Configuration index 8cd41f583f..645b823753 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit 8cd41f583f13ebfa02b65c0cbab426a19f8a5ffd +Subproject commit 645b8237533e5152f19798a55d1ebf7f927b32ee diff --git a/modules/DataProtection b/modules/DataProtection index db71d243d5..ba3cf559bd 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit db71d243d50fd2d26a415b1140c64ecb04338af3 +Subproject commit ba3cf559bd5beb03d78293744a6f7474cacde7cb diff --git a/modules/DependencyInjection b/modules/DependencyInjection index ef28775c2d..aaab2f53c4 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit ef28775c2d2602b17f9668b02dd66b7e86877514 +Subproject commit aaab2f53c44a066611ec90a7514f6dcb26fbbbf1 diff --git a/modules/Diagnostics b/modules/Diagnostics index 4ef2bc2e91..89b25723db 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 4ef2bc2e916117b765d03a86c8f88555532166ad +Subproject commit 89b25723dbd31c87d23438a763552d56a0a861eb diff --git a/modules/DotNetTools b/modules/DotNetTools index 9b5015d6fe..3385cfea1b 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 9b5015d6fee90cc77c9130d3faf7904bcdd36ed6 +Subproject commit 3385cfea1b33f0d1f74b0d312b75b4aad969620c diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index be80ab089a..818a210c44 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit be80ab089a7165f93c984552a22a41b398868693 +Subproject commit 818a210c444ef5d886460cbd9c4117620939f1f2 diff --git a/modules/EventNotification b/modules/EventNotification index de56b17e3b..46ff2a47a4 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit de56b17e3bd4a9f60539545b8d81f9187da4e486 +Subproject commit 46ff2a47a41fd265669f3cfcca2d4742266eca69 diff --git a/modules/FileSystem b/modules/FileSystem index a590a7e347..2ce0323e3d 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit a590a7e347bba3c351f79b5abc29c0bd0f715a16 +Subproject commit 2ce0323e3df2f94352c6f28c895a6a617827b49e diff --git a/modules/Hosting b/modules/Hosting index 6e957e436a..7644204569 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 6e957e436a02642266241e2799aaf5c60e84541a +Subproject commit 7644204569148b688f54d31613d4a0c3bd0a3673 diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index 00d5959323..6c2432e544 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit 00d595932354b96431e6684b49c3b436bae08e20 +Subproject commit 6c2432e5448fc71889e374fee3f6c7472c18628a diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index b97e40ff7d..e7055a11ae 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit b97e40ff7dde747a743fe6eea818c8061aa06541 +Subproject commit e7055a11aec055799a49032635a2d4f0a9a5bb76 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index f07ebbf0f9..3fc98d44ca 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit f07ebbf0f9b4177eef33f67890ac3b19c21d89ee +Subproject commit 3fc98d44ca3e35508903bcf6729c047b5418b556 diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 988972e1e5..6ce8b74ea4 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 988972e1e5c920e199b4ede7dff5f867b502234d +Subproject commit 6ce8b74ea4a59a33e3a5c08bf45f86a2456da64b diff --git a/modules/IISIntegration b/modules/IISIntegration index 7e0c5813e8..03c5357ee2 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 7e0c5813e8a8ee0dc271a34d43356a1e3a4434a7 +Subproject commit 03c5357ee2082cf2d912bc31d8ed54687a4e01c2 diff --git a/modules/Identity b/modules/Identity index 034e2ad188..9b2a7d35f4 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 034e2ad18865158de7aeb2353c89f9b2dd9af0ef +Subproject commit 9b2a7d35f4b73e5e2ba842b9ec11212491c9d2af diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index f22297a4db..8ddacb8b73 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit f22297a4db3d62c8c0bdbfca575f8115004855a5 +Subproject commit 8ddacb8b73962f3bb2bbdf6345f37ff28d6fc2e4 diff --git a/modules/JsonPatch b/modules/JsonPatch index fc1b2ab548..40d5c7f839 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit fc1b2ab5489337be36e56b86b3ab7cf71f6596f2 +Subproject commit 40d5c7f839f86a927bd39777e8b4198aafc098ee diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 9ea2c50068..9662e2bd01 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 9ea2c50068c77978f0df7b3c58368167503dfa50 +Subproject commit 9662e2bd015b0884aff7882f8214da61e2e53715 diff --git a/modules/Localization b/modules/Localization index 7d89ed61cd..979c8f01e0 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit 7d89ed61cd081aefcec49eee8f36e1edfab9f585 +Subproject commit 979c8f01e01877b4eeb1a6c79eaac1a199bbfd5f diff --git a/modules/Logging b/modules/Logging index d4588d07e6..b2c4d45da6 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit d4588d07e61534ef9d6bdb06fd7320c619500e68 +Subproject commit b2c4d45da6603279aad4064d32d1c1daef1749e7 diff --git a/modules/MetaPackages b/modules/MetaPackages index 3235adf61a..750fd873d1 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 3235adf61ad3e4ed2b02ee7c09ce0e60d52a2e5f +Subproject commit 750fd873d172b382ef53a4146872688044fcb2c7 diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index 2b9f77f914..466a480211 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit 2b9f77f914c70f37add0a5cdea641bce4ec42db7 +Subproject commit 466a4802116ae581a9a6947c03889e4d59836a6f diff --git a/modules/MusicStore b/modules/MusicStore index fce76da097..23d7955517 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit fce76da0970add3f9cbad40dea959f4fb7916960 +Subproject commit 23d79555178057757b2c6c3e8ba134cffd3bd498 diff --git a/modules/Mvc b/modules/Mvc index 5e019bd707..e781cd38cf 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 5e019bd707497b0d28a7387c7ed66447a1907d59 +Subproject commit e781cd38cffaaf9f9b851f6cd301212d5acf97c9 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 83ebebcabc..f08b4a7b0b 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 83ebebcabc90783c7b45b006fd5b2a0ca3e62edc +Subproject commit f08b4a7b0b07130de9334f0c818e81eb406bd100 diff --git a/modules/Options b/modules/Options index 6d17b061e4..22d2d52a30 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit 6d17b061e4e61e73225eb013a8d15432f8cc2068 +Subproject commit 22d2d52a3047706537064124283fd4159c92033a diff --git a/modules/Proxy b/modules/Proxy index eaa1388581..10420007ce 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit eaa1388581931dfa3c7b530a50c9344b5126fa81 +Subproject commit 10420007ce449eb33d76cd8452cd681018c502df diff --git a/modules/Razor b/modules/Razor index b1007744b0..dc997821cc 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit b1007744b00ce094af080602ee26d3887a786d56 +Subproject commit dc997821ccd7b74c658b845aabff9a6e40a3bcd5 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 7865e2d4bd..532af71577 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 7865e2d4bdbf4a7fed690e2e4c8ba8597380d743 +Subproject commit 532af71577408c42b197b3f294c447470406ba4b diff --git a/modules/Routing b/modules/Routing index f0e88ede96..f4e57be575 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit f0e88ede96dc6b8fd54d4b36d2333d7e152d2079 +Subproject commit f4e57be5758b6079582919b431aa0d7e538938d4 diff --git a/modules/Scaffolding b/modules/Scaffolding index 49af135e4c..b0eec6c5a8 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 49af135e4cbe059de495505de4d81d9cc1de3de6 +Subproject commit b0eec6c5a823e7f2d9a8c9f91105b315e832b1d8 diff --git a/modules/Security b/modules/Security index 0d0f703e3e..30493e2fd6 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit 0d0f703e3e074fe60b8e9fc3846ce03547022305 +Subproject commit 30493e2fd63907d0484b940c069d681dcb962591 diff --git a/modules/ServerTests b/modules/ServerTests index 02ebb4fc64..da33bd257a 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 02ebb4fc6429eb6b55571e297061902d20a85bae +Subproject commit da33bd257a7fd9737331fed33919e146d8b02061 diff --git a/modules/Session b/modules/Session index b77b9b10da..a9f6f3bb3d 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit b77b9b10dad00b78dab0437a3a2f95b042c951dc +Subproject commit a9f6f3bb3d0e84c8c88816f6cdb08fa7554de183 diff --git a/modules/SignalR b/modules/SignalR index 1c7ca7fa3a..31debcbf9f 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 1c7ca7fa3a1d17551ff26bd33a2f3705989fe6f4 +Subproject commit 31debcbf9f7a2906f9b8f75676319ec51b2dd379 diff --git a/modules/StaticFiles b/modules/StaticFiles index b900f1ccf1..bf0e4f8fb5 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit b900f1ccf1738e68154bc9d39682050c176bdae9 +Subproject commit bf0e4f8fb5c4b0d56c70d42895a173f99ab149a0 diff --git a/modules/Templating b/modules/Templating index 4236f0e51c..718989b820 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 4236f0e51c6bc5672987a9e5f63acd6652ae2536 +Subproject commit 718989b820e44c86c42f5cb796faa61f54604020 diff --git a/modules/Testing b/modules/Testing index 00aed18940..807e41b008 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit 00aed1894099699ea063424ec69fed1ae4b04be6 +Subproject commit 807e41b008c9797c737649964f63c08d40063ce4 diff --git a/modules/WebHooks b/modules/WebHooks index 5da0e4e035..eecaac30c5 160000 --- a/modules/WebHooks +++ b/modules/WebHooks @@ -1 +1 @@ -Subproject commit 5da0e4e03526006f64f15e338d3f6671621526da +Subproject commit eecaac30c56c49db22124667fa28170d34df577e diff --git a/modules/WebSockets b/modules/WebSockets index c222a398db..07dddce092 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit c222a398dbaea64012573abdcf6374813aa880da +Subproject commit 07dddce092708a216350aa6a7e95c104a3d03756 From 2d316fcd86d20a61b662cd278a4790dc07b70e53 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 17 Apr 2018 19:47:04 -0700 Subject: [PATCH 05/10] Updating submodule(s) SignalR => 391c2811948513529e649f0d95712c976790444b [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 31debcbf9f..391c281194 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 31debcbf9f7a2906f9b8f75676319ec51b2dd379 +Subproject commit 391c2811948513529e649f0d95712c976790444b From 6f2df6c78b75d5a08fedd1d8fba538ed716b6e9b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 17 Apr 2018 19:47:17 -0700 Subject: [PATCH 06/10] Updating BuildTools from 2.1.0-rc1-15770 to 2.1.0-rc1-15771 [auto-updated: buildtools] --- korebuild-lock.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index a6327f8728..5abe786b93 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-rc1-15770 +version:2.1.0-rc1-15771 commithash:a2abdc6fa0e8a1a465e830100950f1ecc698ab28 From b40240a337db67b68386afd9cb9d4b368faa9286 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 17 Apr 2018 20:53:23 -0700 Subject: [PATCH 07/10] Updating submodule(s) SignalR => b4046b5ed83c6d06abd9783ef67ed794e8be5076 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 391c281194..b4046b5ed8 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 391c2811948513529e649f0d95712c976790444b +Subproject commit b4046b5ed83c6d06abd9783ef67ed794e8be5076 From 9ffe831749ecbed36986d88114f64d18bdf40326 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 17 Apr 2018 22:00:30 -0700 Subject: [PATCH 08/10] Updating submodule(s) SignalR => 7dd6d82bba4302bf403226e639e0f50e3c5c70c1 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index b4046b5ed8..7dd6d82bba 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit b4046b5ed83c6d06abd9783ef67ed794e8be5076 +Subproject commit 7dd6d82bba4302bf403226e639e0f50e3c5c70c1 From 076ebbe055fe2f1a34263c2e1077225fc1c73afc Mon Sep 17 00:00:00 2001 From: prafullbhosale Date: Wed, 18 Apr 2018 09:10:33 -0700 Subject: [PATCH 09/10] Add version variable for Microsoft.NETCore.DotNetAppHost dependency (needed for global tools) (#1079) --- build/dependencies.props | 1 + build/external-dependencies.props | 3 +++ 2 files changed, 4 insertions(+) diff --git a/build/dependencies.props b/build/dependencies.props index 204ba32114..57ef2b86a4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -5,6 +5,7 @@ 2.1.0-preview3-26413-05 2.1.0-preview3-26413-05 + 2.1.0-preview3-26413-05 4.5.0-preview3-26413-02 4.7.0-preview4.5065 4.5.0-preview3-26413-02 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 10a465b964..96cd5cf3f7 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -38,6 +38,9 @@ + + + From 6edc4bf3b6728c45773860c23f3f482206e0d97c Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 18 Apr 2018 09:11:48 -0700 Subject: [PATCH 10/10] Mark Microsoft.NETCore.DotNetAppHost as a private dependency --- build/external-dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 96cd5cf3f7..c45828c525 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -39,7 +39,7 @@ - +