diff --git a/build/artifacts.props b/build/artifacts.props index eec23a6efe..787057c646 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -10,10 +10,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/dependencies.props b/build/dependencies.props index af818f59d3..8ecd542ea2 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -32,7 +32,7 @@ 1.1.5 2.0.7 1.0.1 - 15.6.1 + 15.3.0 3.0.1 3.0.1 3.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 454d1be242..47cb1581d4 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -198,185 +198,14 @@ not building again in this patch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/submodules.props b/build/submodules.props index cac8f3235e..fd4d65b78e 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -7,53 +7,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/korebuild-lock.txt b/korebuild-lock.txt index f22768dc12..5e0e3247df 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.0.7-rtm-10027 -commithash:13a02f8875b73d7f9f922fce7b82fe6a44956247 +version:2.0.8-rtm-10029 +commithash:02ac27ac741ef7b2a2ecd6ac08ff7b352007408a diff --git a/modules/Antiforgery b/modules/Antiforgery index af5623fb4b..262d123aea 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit af5623fb4bdeb5d5aa6f10a213f6f10bafd7334a +Subproject commit 262d123aeae529e56160a03a1365e1cff095e82c diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 8cbc8e6a8c..a926239281 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 8cbc8e6a8c9c84429e5fb2908e8c5a3b6d91da19 +Subproject commit a926239281dba7fd83404e321e8ce263569c68f7 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 6138024884..0df8a6bdcb 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 613802488474bf4938345417faf321e64a173272 +Subproject commit 0df8a6bdcbe9a8f9f4aafabba635a213377540c1 diff --git a/modules/BrowserLink b/modules/BrowserLink index 264e797c42..944c5a1788 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit 264e797c42d51b7eeb074e8da739f7888c67602e +Subproject commit 944c5a1788a853a6264c798741e6968018ea9d90 diff --git a/modules/CORS b/modules/CORS index 54018f1f97..fb4d7e5db1 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 54018f1f97257ffae920e98525fcabfcf7f058cf +Subproject commit fb4d7e5db1ccfcc7c8eaa52cb34b4a21776bf1d3 diff --git a/modules/Caching b/modules/Caching index d3c4b58119..83b70a8a1e 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit d3c4b58119652b7c566fb00fcf19b907d9db18bc +Subproject commit 83b70a8a1e2c29f56bc95335799ed70038f07cc4 diff --git a/modules/Configuration b/modules/Configuration index c3f21a72ef..cfb4848776 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit c3f21a72efad1174ea5086e021c4798a439824d0 +Subproject commit cfb48487769b7fa6395e94fdcc9f707d812d8ba0 diff --git a/modules/DataProtection b/modules/DataProtection index c4c6e1b0e9..d7cb942a77 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit c4c6e1b0e9667662646939139205e12bf57e865c +Subproject commit d7cb942a778c9b40065bd2f171b678726334a25e diff --git a/modules/Diagnostics b/modules/Diagnostics index df09b97669..1c2388eeb8 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit df09b976698fc024a944aaa918987c6fd78b8420 +Subproject commit 1c2388eeb82bfe2ec51f4e0be816b2e5b98cfebd diff --git a/modules/DotNetTools b/modules/DotNetTools index 78b8c3337d..5377725b66 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 78b8c3337d4725b9108422cd98c951facc9067c2 +Subproject commit 5377725b666a51c027accae9a5cb7469d01b3f60 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index b9309a7e82..7d8a834220 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit b9309a7e825e0283354e6b4e4480ca74e8b2888e +Subproject commit 7d8a8342207104ea967219e981bb2c5df4075f8b diff --git a/modules/Hosting b/modules/Hosting index 844f6a57af..08d75033b5 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 844f6a57af553d1cb89c113a5254470b735a1bd9 +Subproject commit 08d75033b5e9b515f9c27368f23486629dbe40da diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index ab623aeb00..10aa71fdab 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit ab623aeb00dd27c9a55c9a4f1662b5304f9acfb4 +Subproject commit 10aa71fdabe8882869445c812cab21ae26fcfe49 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 022f96fc70..f81559a9ef 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 022f96fc7078d2879ab3ca78680ef6861f66ec54 +Subproject commit f81559a9ef227b27ea5e893e5006ab264f6b7e91 diff --git a/modules/HttpSysServer b/modules/HttpSysServer index b85f18fe18..c53960ab5b 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit b85f18fe18f511df0af442f5c9d3485c09b909d0 +Subproject commit c53960ab5befa3808c779551f6c1c8cb9cc4a09a diff --git a/modules/IISIntegration b/modules/IISIntegration index 346315f5c0..398ab66f38 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 346315f5c0f5f6ea064fb4f0fffe930d3717d91c +Subproject commit 398ab66f3890889bca9d3acda3a2828e019ec7bc diff --git a/modules/Identity b/modules/Identity index 15a82284ce..1a5f6945d9 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 15a82284ce52dc8932c49f3246763f3ea05a3568 +Subproject commit 1a5f6945d945f24624dae50b0d122c70f4a688d3 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 44d39bc0d4..09ae669370 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 44d39bc0d42c7f6c5a3f61cdeead4d70f625b6e2 +Subproject commit 09ae6693708349a61b23acfc2c8a13b1d19f99b9 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 93022c062b..8392ecdb81 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 93022c062b5ad4c2cf6717a0671b8e5984c72ab7 +Subproject commit 8392ecdb81698aec199a44ab8c1e937d1c68a688 diff --git a/modules/Localization b/modules/Localization index beacd97a93..4fa767ea88 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit beacd97a93a768b333e4ab30c710fbd32150a2dc +Subproject commit 4fa767ea886c1487e2b6dfbe5203f0dd5d64d5a0 diff --git a/modules/Logging b/modules/Logging index c2bf63ed67..2a8e63d595 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit c2bf63ed67058ed86dd66f6fea85532b5ed4f67a +Subproject commit 2a8e63d5950071089dbe6eff8202a4a3f5db7dfb diff --git a/modules/MetaPackages b/modules/MetaPackages index c5dc6f6959..d700049929 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit c5dc6f6959af04bfe0862acaf6db9d3086dcf07f +Subproject commit d700049929ba09abab94596b3ea05a4e79affb74 diff --git a/modules/Mvc b/modules/Mvc index aeab6e295e..b24cd456d9 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit aeab6e295efdc0b1d89c375b62a84fe3b6ba969e +Subproject commit b24cd456d9d9b5299bbf484292c7d0d7fe490a55 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index aa8c8d6064..0b31128381 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit aa8c8d6064caf8220eb94c507b770ba6656935d2 +Subproject commit 0b311283815e4d5019209402383934426e94fd9e diff --git a/modules/Options b/modules/Options index e8275d1dee..8a94262ff0 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit e8275d1dee8a4e8b03f0d87e81ebc8ef586e2fb7 +Subproject commit 8a94262ff0d33fe1e90c7d8c132b4ec59d8f3165 diff --git a/modules/Proxy b/modules/Proxy index 4665584812..a0ca5e0ee7 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit 466558481201e2fdedbd2d7d5fdfe288aae85a98 +Subproject commit a0ca5e0ee7988fac55063e0d8386ba546f87ecdd diff --git a/modules/Razor b/modules/Razor index 386840c82b..7dbb837dfb 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 386840c82b3122d06c5139955f70a2a87f2d1d0a +Subproject commit 7dbb837dfbbfeb61723c4b65705f9c8c7a3fae50 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 2adda717c7..74d699637c 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 2adda717c749829f6c670f86a079508c14783390 +Subproject commit 74d699637c5e77613e7ebbd4731f4ec17a3abbea diff --git a/modules/Routing b/modules/Routing index c3cdbf67f0..5bb7b03d41 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit c3cdbf67f0606cd95eafe4194924e1ca6439da20 +Subproject commit 5bb7b03d418806b73bdbb47e94855c6dbf38ef81 diff --git a/modules/Scaffolding b/modules/Scaffolding index 8e389bea6b..6c3776781b 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 8e389bea6b88d85d0388926b5176a1e31cd951cc +Subproject commit 6c3776781bd3c517dd202fa3f6353bf6d886e045 diff --git a/modules/Security b/modules/Security index bbf5cac2ab..48dceba628 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit bbf5cac2abd1cf4dca6831ae71097571c036ee56 +Subproject commit 48dceba628d4d4f15dd70b71dcdd55c4d7dad7e0 diff --git a/modules/ServerTests b/modules/ServerTests index 0c313bb216..92dd665af8 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 0c313bb2164330b127e8941f91c67930bf550453 +Subproject commit 92dd665af81c521fa1ababb5bb0b3201ef2d7090 diff --git a/modules/Session b/modules/Session index 643c53de3d..7e6d4f4669 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit 643c53de3d75479559391e3ffde3e24f5feb5e73 +Subproject commit 7e6d4f46696fbc1eb788734a06b07b854377b80d diff --git a/modules/StaticFiles b/modules/StaticFiles index 6be7940dda..89060e55c5 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 6be7940dda62d06c40b6e0144f1fbe0adf66c6c4 +Subproject commit 89060e55c5b62d8b28c4183ddc6984f63be08aba diff --git a/modules/Templating b/modules/Templating index 5dad28a2aa..4dd1c7ae06 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 5dad28a2aa4acefcbbd6a86097f09fcbf5179eba +Subproject commit 4dd1c7ae0677b8b9fcf9f4834a86b2da713d014e diff --git a/modules/Testing b/modules/Testing index 7d50390d3a..979bde30c1 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit 7d50390d3ae3e1eea19cac017062e402e4cc212b +Subproject commit 979bde30c1773991a56dce73ef64ed4f44269e02 diff --git a/modules/WebSockets b/modules/WebSockets index 32c29cb3c4..33fcef2ad9 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit 32c29cb3c4ac317e93010341fc597045388d03b4 +Subproject commit 33fcef2ad9fda677f094d0369b95dcb79738ed36 diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 index de09ecd311..61eb553cca 100755 --- a/scripts/PatchVersionPrefix.ps1 +++ b/scripts/PatchVersionPrefix.ps1 @@ -43,7 +43,9 @@ foreach ($repo in $Repos) { $versionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/VersionPrefix') $epxVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalProjectVersionPrefix') + $exVersionPrefix = $xml.SelectSingleNode('/Project/PropertyGroup/ExperimentalVersionPrefix') BumpPatch $epxVersionPrefix + BumpPatch $exVersionPrefix BumpPatch $versionPrefix SaveXml $xml $path }