From 9273759dca814882aa107d563270ce3be67e0a7a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 29 Jun 2018 11:02:39 -0700 Subject: [PATCH 01/42] [2.1]: Remove unused project capability from Microsoft.AspNetCore.App (#1237) Removing this from .App in 2.1.3 because this was unused, and the capability is not actually supported by VS. This will be re-added in the future versions of .App when we land the VS integration for in-process hosting. cref https://github.com/aspnet/IISIntegration/pull/969 --- .../build/netcoreapp2.1/Microsoft.AspNetCore.App.props | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props index b45f971fa7..009b464763 100644 --- a/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props +++ b/src/Microsoft.AspNetCore.App/build/netcoreapp2.1/Microsoft.AspNetCore.App.props @@ -11,11 +11,4 @@ <_AspNetCoreAppSharedFxIsEnabled Condition=" '$(_AspNetCoreAppSharedFxIsEnabled)' == '' ">true - - - - - From 1b69fd7fbe90a021df5d7264014b3c19e3a6a7e9 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 11:22:17 -0700 Subject: [PATCH 02/42] Updating submodule(s) Mvc => c4d5ef94a9e070c5757a0ae6361c369ef83344b6 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 78fc49ba0c..c4d5ef94a9 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 78fc49ba0c8ad7859e1f3a8aa6c3d17c7cd11f5a +Subproject commit c4d5ef94a9e070c5757a0ae6361c369ef83344b6 From 8908fbd8b20bad86a4edf114b706327c192199ad Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 11:52:17 -0700 Subject: [PATCH 03/42] Updating submodule(s) Razor => 1c9208ba110a16eb98085406fd7db874657b642c [auto-updated: submodules] --- modules/Razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Razor b/modules/Razor index ca2d5738d6..1c9208ba11 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit ca2d5738d61f3b751511da3a44cc04fd8a7ae724 +Subproject commit 1c9208ba110a16eb98085406fd7db874657b642c From e9274a4d9388ac968e7971d52bd4b3e0b5b41dba Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 19:22:19 +0000 Subject: [PATCH 04/42] Updating submodule(s) Mvc => 82f7f2aab88f1b9af15f60df3830ed327b2d5a89 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index c4d5ef94a9..82f7f2aab8 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit c4d5ef94a9e070c5757a0ae6361c369ef83344b6 +Subproject commit 82f7f2aab88f1b9af15f60df3830ed327b2d5a89 From 297659eff8cc5ddb48f108cb6bd32780c660ca6e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 13:03:14 -0700 Subject: [PATCH 05/42] Updating submodule(s) EntityFrameworkCore => 77512c451480d52f9b4e2970a8ba72d9f38c0141 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index c5ef200857..77512c4514 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit c5ef20085735805e585874b29bdf99ba44365b61 +Subproject commit 77512c451480d52f9b4e2970a8ba72d9f38c0141 From ecf615db851c408443cf1321238bfd09a43bd08f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 16:16:48 -0700 Subject: [PATCH 06/42] Updating submodule(s) AADIntegration => bd08558a492c8e2477714c99342cb120e775a6c2 Antiforgery => 1727967f08e76c49b941fba269aefd6408ade017 AuthSamples => 3ad862dc7a49f59047bd552bb56ad06e3af7b2f6 AzureIntegration => 6c50820a4954e9027a67e89666c519f17f8aa98e BasicMiddleware => 0c84821f23bdba59401ae46bc5e983d34e602e3b BrowserLink => f19181ae7a71e0d5e3fe8fe8e48edecbbccf91a6 Caching => 611f3f7a44058f1a192e171309dbd5f2c287ab52 Common => 0fc8c5e85799bd64baa3965f413a38dc89eea82e Configuration => 00b0b3aa6aea102eb8fde94629889bc219ff9d51 CORS => 0c7cf1b06e4d9e299d1624bc20dc03e81d3e268b DataProtection => a5c86afe7d61e90ab7540008e52390fbcf938447 DependencyInjection => 42208714de59bbedf25fca5c771b1a35eafed287 Diagnostics => 2f8eaa5ea4960907dc71100502e08eb92508f8e6 DotNetTools => 3177be42f50495aa2295ddbe28a4b52163c8bc01 EntityFrameworkCore => 99702ba85e2ca173176a4dc87db698672bc40099 EventNotification => 659c6c23eb373d61447d0bedb830e672dc6971d6 FileSystem => dd16c9a4d366c7c73e1b66ec095008a41d7bdb9d Hosting => 5fd60d68b6fb30b9de9a639ae07fa9ac42babd22 HtmlAbstractions => 2d659e53829c4fab0a03fed934b5fedc2ce39c79 HttpAbstractions => a6929fe02b5635784bc3ff787205639772527838 HttpClientFactory => b9949e718bc563f473ed5a510357df1a07e77fe2 HttpSysServer => e76c04eecc2222282ae30b8ec10c8942be853868 Identity => 1bcd78c1d8e052ecc984576540ce05ef81e6b613 IISIntegration => 65d3787fc483959166d9ecc75d392dcee7e90a2a JavaScriptServices => 067298bead65a91fad34fe7dc524519300b25da2 JsonPatch => 2c1b6f9e8dec7f071a9d61f490d4edd639746688 KestrelHttpServer => bcc9bce87b462f63362b1915d7c831790a3ca6e7 Localization => 56bcb226399bae0e2d23c9b3d6dd4308a66bac6c Logging => 334983f3953d1f8acd81e9be28c0768064d310cf MetaPackages => 68cecdbee0bb26256bf4c5fe334a41d4f38ae6af Microsoft.Data.Sqlite => 5daab741f372e88af81b5f7cfd68486adcff347a MusicStore => bb04931fe6452ecd02e73f127108280357abd031 Mvc => c2fcfabdf3f7bbcaaecbc77ecbfe358b3b7e0092 MvcPrecompilation => ebd30270a439e5a62769857132111cd3dbe28a68 Options => 7d0c98e54daad71dce99693ca61c93275cc02c3d Proxy => fa78958d4c9cd83e3e9fdbf44f204c8fcf6982c8 Razor => f9a09372b7185cf03d058bd6a4ca7097855b45b7 ResponseCaching => 77c2d62a59ea97b8d9e09572bd5d27655671b2c4 Routing => 0a44dcf4e38cdd8efb75601ce5da0f6742fd5000 Scaffolding => 20aede038470a77839bdeb1a52b4a767fe8a0170 Security => 866b0b66a4f06fd7aba74f12f20e14f4f153e30b ServerTests => eae90d6e7a9f5dc3ff9bee042b9b636c11b7f1df Session => 3c5a5e65ccdf8921cb1c1eab40198f262aa224ed SignalR => b6c99069dde7009685ddbb390b4069aa31817a19 StaticFiles => 91f4696ae62d6e1cfd284468d228d9adaa924301 Templating => 96adddcbca01dde3f89a23329f7832568170027f WebSockets => 519851627cd78bd1dcac564fba76b50933c6a85b [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/WebSockets | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/modules/AADIntegration b/modules/AADIntegration index fb630c8ba2..bd08558a49 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit fb630c8ba2eebd1f50e2fa7a637ad0c98e4fee70 +Subproject commit bd08558a492c8e2477714c99342cb120e775a6c2 diff --git a/modules/Antiforgery b/modules/Antiforgery index 164c6cdfcb..1727967f08 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 164c6cdfcbc07d0e32b7b7872ebed04714e903a2 +Subproject commit 1727967f08e76c49b941fba269aefd6408ade017 diff --git a/modules/AuthSamples b/modules/AuthSamples index bbded609b2..3ad862dc7a 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit bbded609b2266f5abd6cfee724ef487f770977fb +Subproject commit 3ad862dc7a49f59047bd552bb56ad06e3af7b2f6 diff --git a/modules/AzureIntegration b/modules/AzureIntegration index dd3eda2fe4..6c50820a49 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit dd3eda2fe401a686fa6e392c63fd738acc2ba4fb +Subproject commit 6c50820a4954e9027a67e89666c519f17f8aa98e diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 68a14eecf1..0c84821f23 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 68a14eecf11b0a473ba87cec5bb60f32cf380556 +Subproject commit 0c84821f23bdba59401ae46bc5e983d34e602e3b diff --git a/modules/BrowserLink b/modules/BrowserLink index 9079e191d5..f19181ae7a 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit 9079e191d53375338e091b6deb4a8943be794e56 +Subproject commit f19181ae7a71e0d5e3fe8fe8e48edecbbccf91a6 diff --git a/modules/CORS b/modules/CORS index 554855cab3..0c7cf1b06e 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 554855cab34961a27a6cf248fbb847b9dd8bd8d4 +Subproject commit 0c7cf1b06e4d9e299d1624bc20dc03e81d3e268b diff --git a/modules/Caching b/modules/Caching index 0a729862e2..611f3f7a44 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit 0a729862e2c34ffbf27d888b3b6f1e63dbf4b539 +Subproject commit 611f3f7a44058f1a192e171309dbd5f2c287ab52 diff --git a/modules/Common b/modules/Common index d3cfd4e0c9..0fc8c5e857 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit d3cfd4e0c963353631a6d461fe19fabebd3c76e0 +Subproject commit 0fc8c5e85799bd64baa3965f413a38dc89eea82e diff --git a/modules/Configuration b/modules/Configuration index e696d10fef..00b0b3aa6a 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit e696d10fef92bb66452a8908e191427b8e62b38e +Subproject commit 00b0b3aa6aea102eb8fde94629889bc219ff9d51 diff --git a/modules/DataProtection b/modules/DataProtection index 678fe889c3..a5c86afe7d 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit 678fe889c34275bf5b4d3769964790f9ec8c6095 +Subproject commit a5c86afe7d61e90ab7540008e52390fbcf938447 diff --git a/modules/DependencyInjection b/modules/DependencyInjection index 9732ad87e5..42208714de 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit 9732ad87e590401a8005c378d94723cfa522c11c +Subproject commit 42208714de59bbedf25fca5c771b1a35eafed287 diff --git a/modules/Diagnostics b/modules/Diagnostics index 7f463b2793..2f8eaa5ea4 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 7f463b27931f9614b13c94fc89df13d0b44e8712 +Subproject commit 2f8eaa5ea4960907dc71100502e08eb92508f8e6 diff --git a/modules/DotNetTools b/modules/DotNetTools index b882d97277..3177be42f5 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit b882d9727751f58435368444270495838f236060 +Subproject commit 3177be42f50495aa2295ddbe28a4b52163c8bc01 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 9ca890848e..99702ba85e 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 9ca890848eb679c65296d47a1fd3570dfb7075b7 +Subproject commit 99702ba85e2ca173176a4dc87db698672bc40099 diff --git a/modules/EventNotification b/modules/EventNotification index a4d3ba190d..659c6c23eb 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit a4d3ba190da5ce4a13230307029f051196036dc7 +Subproject commit 659c6c23eb373d61447d0bedb830e672dc6971d6 diff --git a/modules/FileSystem b/modules/FileSystem index 9577475b08..dd16c9a4d3 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 9577475b088299cf4c88e5c3ecae8a6876ab14d2 +Subproject commit dd16c9a4d366c7c73e1b66ec095008a41d7bdb9d diff --git a/modules/Hosting b/modules/Hosting index 2a98db6a73..5fd60d68b6 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 2a98db6a73512b8e36f55a1e6678461c34f4cc4d +Subproject commit 5fd60d68b6fb30b9de9a639ae07fa9ac42babd22 diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index fdf97c547e..2d659e5382 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit fdf97c547ed8a38118fd5866ebd42b4aff609579 +Subproject commit 2d659e53829c4fab0a03fed934b5fedc2ce39c79 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 0f4f1950f1..a6929fe02b 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 0f4f1950f15323e7cda7665b7e277efdd6034531 +Subproject commit a6929fe02b5635784bc3ff787205639772527838 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index eea2ba82e8..b9949e718b 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit eea2ba82e83b7a7825a64081ba8b86a29588e577 +Subproject commit b9949e718bc563f473ed5a510357df1a07e77fe2 diff --git a/modules/HttpSysServer b/modules/HttpSysServer index b44f8f61d1..e76c04eecc 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit b44f8f61d134030a485270c0cf9d875a415ddffe +Subproject commit e76c04eecc2222282ae30b8ec10c8942be853868 diff --git a/modules/IISIntegration b/modules/IISIntegration index b84a233d39..65d3787fc4 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit b84a233d39faaa86591695081b0274fbb4ef2ac4 +Subproject commit 65d3787fc483959166d9ecc75d392dcee7e90a2a diff --git a/modules/Identity b/modules/Identity index d92c2732c5..1bcd78c1d8 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit d92c2732c512e5381b14dc60463b8411b9a5c27d +Subproject commit 1bcd78c1d8e052ecc984576540ce05ef81e6b613 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index cf659b3fda..067298bead 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit cf659b3fda367619f3873bd5f0e445698cebe340 +Subproject commit 067298bead65a91fad34fe7dc524519300b25da2 diff --git a/modules/JsonPatch b/modules/JsonPatch index a3ff5cfef7..2c1b6f9e8d 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit a3ff5cfef7e02edf8b7ab05b437dfa4918669b3d +Subproject commit 2c1b6f9e8dec7f071a9d61f490d4edd639746688 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 2ab22ac55a..bcc9bce87b 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 2ab22ac55a1d1964d61368015336e5b3e16d09c0 +Subproject commit bcc9bce87b462f63362b1915d7c831790a3ca6e7 diff --git a/modules/Localization b/modules/Localization index a00708da34..56bcb22639 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit a00708da349b33e4c3d3afbdc19bac6211a77779 +Subproject commit 56bcb226399bae0e2d23c9b3d6dd4308a66bac6c diff --git a/modules/Logging b/modules/Logging index 0596ca78a1..334983f395 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 0596ca78a156924dd452396364293ed712700b0e +Subproject commit 334983f3953d1f8acd81e9be28c0768064d310cf diff --git a/modules/MetaPackages b/modules/MetaPackages index a6caaec7b4..68cecdbee0 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit a6caaec7b46a9fcd64fb05b1d12adf5d4b9622c9 +Subproject commit 68cecdbee0bb26256bf4c5fe334a41d4f38ae6af diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index b62ff3a2e6..5daab741f3 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit b62ff3a2e632dac6b1ed195f4fa76330101b4df4 +Subproject commit 5daab741f372e88af81b5f7cfd68486adcff347a diff --git a/modules/MusicStore b/modules/MusicStore index f6470322bc..bb04931fe6 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit f6470322bc8895dac87467423afbb0e207f6ead1 +Subproject commit bb04931fe6452ecd02e73f127108280357abd031 diff --git a/modules/Mvc b/modules/Mvc index 13585f711f..c2fcfabdf3 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 13585f711f942dd22e2d28654fbde388ccb6f3f2 +Subproject commit c2fcfabdf3f7bbcaaecbc77ecbfe358b3b7e0092 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 3cd73aa2fa..ebd30270a4 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 3cd73aa2fa641db30c0a1454d8e1a0205bdc36da +Subproject commit ebd30270a439e5a62769857132111cd3dbe28a68 diff --git a/modules/Options b/modules/Options index e459e307bc..7d0c98e54d 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit e459e307bc31044e01c0130861947c91f5504b53 +Subproject commit 7d0c98e54daad71dce99693ca61c93275cc02c3d diff --git a/modules/Proxy b/modules/Proxy index d4eac80152..fa78958d4c 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit d4eac8015299f6738fd060e631fd73f99372c84a +Subproject commit fa78958d4c9cd83e3e9fdbf44f204c8fcf6982c8 diff --git a/modules/Razor b/modules/Razor index 942d4d194c..f9a09372b7 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 942d4d194ccf18cbcd6e22af3541ff77b7b61192 +Subproject commit f9a09372b7185cf03d058bd6a4ca7097855b45b7 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 79e2664f7c..77c2d62a59 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 79e2664f7c4bc9ed599364e6659be684f3c2036e +Subproject commit 77c2d62a59ea97b8d9e09572bd5d27655671b2c4 diff --git a/modules/Routing b/modules/Routing index 1009705283..0a44dcf4e3 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 1009705283309515006ce302fad52774df168b6a +Subproject commit 0a44dcf4e38cdd8efb75601ce5da0f6742fd5000 diff --git a/modules/Scaffolding b/modules/Scaffolding index ff7ca1096f..20aede0384 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit ff7ca1096ffe134cad4d2dbeead675a16139a1a4 +Subproject commit 20aede038470a77839bdeb1a52b4a767fe8a0170 diff --git a/modules/Security b/modules/Security index d8821d7eb1..866b0b66a4 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit d8821d7eb120744f5439bcf85ad39c72537e85d3 +Subproject commit 866b0b66a4f06fd7aba74f12f20e14f4f153e30b diff --git a/modules/ServerTests b/modules/ServerTests index 2cb10ef8f2..eae90d6e7a 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 2cb10ef8f20f0d1909769856fc6b69f241193fe9 +Subproject commit eae90d6e7a9f5dc3ff9bee042b9b636c11b7f1df diff --git a/modules/Session b/modules/Session index f268f3ac3d..3c5a5e65cc 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit f268f3ac3d4b9f758bd5016873a2a716584dbe40 +Subproject commit 3c5a5e65ccdf8921cb1c1eab40198f262aa224ed diff --git a/modules/SignalR b/modules/SignalR index f4bf222099..b6c99069dd 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit f4bf2220993e5d3ce9724a88bcbdd7d63c485a8f +Subproject commit b6c99069dde7009685ddbb390b4069aa31817a19 diff --git a/modules/StaticFiles b/modules/StaticFiles index cfbf87ccb7..91f4696ae6 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit cfbf87ccb772ce8cdea292a585ee30bdad1a3101 +Subproject commit 91f4696ae62d6e1cfd284468d228d9adaa924301 diff --git a/modules/Templating b/modules/Templating index d4b8fee39f..96adddcbca 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit d4b8fee39f47ccc233fc9e618ed7dea66f9301f1 +Subproject commit 96adddcbca01dde3f89a23329f7832568170027f diff --git a/modules/WebSockets b/modules/WebSockets index d2b5a2c3dc..519851627c 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit d2b5a2c3dc7a1d85d0ee889786800096418843e1 +Subproject commit 519851627cd78bd1dcac564fba76b50933c6a85b From 459cb8b61426e4dd4b2fc8707b2793bb9a19f2bc Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 16:16:49 -0700 Subject: [PATCH 07/42] Updating BuildTools from 2.2.0-preview1-17091 to 2.2.0-preview1-17095 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 01f09b3d51..30640290d7 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17091 -commithash:3260c92114dd466700f24301e8e52d007767c54a +version:2.2.0-preview1-17095 +commithash:0b08faa19d357e19c2e8173da6c13a057c63d51a From e3448be2525d24c3d14e06b37189a4a260ab2469 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 17:03:12 -0700 Subject: [PATCH 08/42] Updating submodule(s) EntityFrameworkCore => 3860208b6c90e81506276f0faaf7192cc2dddae8 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 99702ba85e..3860208b6c 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 99702ba85e2ca173176a4dc87db698672bc40099 +Subproject commit 3860208b6c90e81506276f0faaf7192cc2dddae8 From c11c72ac236cffeb73110fe35ab1d7f374834d0e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 17:34:12 -0700 Subject: [PATCH 09/42] Updating submodule(s) EntityFrameworkCore => 15bc370703ee500c4c7ff1a4a670c97a829b839b [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 77512c4514..15bc370703 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 77512c451480d52f9b4e2970a8ba72d9f38c0141 +Subproject commit 15bc370703ee500c4c7ff1a4a670c97a829b839b From d456fdba63ed213dcb6bd99735ecd06c1eb89946 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Fri, 29 Jun 2018 19:37:15 -0700 Subject: [PATCH 10/42] Don't publish the runtime-site-extension in servicing builds --- build/Publish.targets | 6 ------ 1 file changed, 6 deletions(-) diff --git a/build/Publish.targets b/build/Publish.targets index 645a816460..cc47d871c1 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -62,7 +62,6 @@ aspnetcore/npm/ aspnetcore/Runtime/$(SharedFxCliBlobChannel)/ nuGetPackagesArchive-$(PackageVersion).lzma - runtime-site-extension-internal-$(PackageVersion).zip aspnetcore-runtime-$(PackageVersion) aspnetcore-runtime-latest aspnetcore-runtime-internal-$(PackageVersion) @@ -77,11 +76,6 @@ - - $(BlobBasePath)$(SiteExtensionArchiveFileName) - ShipInstaller=dotnetcli - - $(BlobBasePath)$(PackageArchiveFileName) ShipInstaller=dotnetcli From 780d3c8588786af69accee3f4d3b54e943e6a6cd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Fri, 29 Jun 2018 20:28:30 -0700 Subject: [PATCH 11/42] Updating BuildTools from 2.2.0-preview1-17095 to 2.2.0-preview1-17097 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 30640290d7..ef66e5ff84 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17095 -commithash:0b08faa19d357e19c2e8173da6c13a057c63d51a +version:2.2.0-preview1-17097 +commithash:d3892605bc92768edd40b857592c409dfc63932c From 1baa04d9b8902cdff88adceb410af2f1985fd0df Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sat, 30 Jun 2018 21:46:02 -0700 Subject: [PATCH 12/42] Updating submodule(s) EntityFrameworkCore => fac2ede689ff55b0337161d81a0e61dc794d84d5 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 15bc370703..fac2ede689 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 15bc370703ee500c4c7ff1a4a670c97a829b839b +Subproject commit fac2ede689ff55b0337161d81a0e61dc794d84d5 From e7429fab398fd6a36478e3dc365caebe024dd35d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Sun, 1 Jul 2018 14:21:26 -0700 Subject: [PATCH 13/42] Updating submodule(s) EntityFrameworkCore => ea9b3d84f9028a8a5eb35ae02babd50836947163 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 3860208b6c..ea9b3d84f9 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 3860208b6c90e81506276f0faaf7192cc2dddae8 +Subproject commit ea9b3d84f9028a8a5eb35ae02babd50836947163 From 3313973c98dfc92d09e272d57a16bba5a986fb09 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 09:52:12 -0700 Subject: [PATCH 14/42] Updating BuildTools from 2.1.3-rtm-15795 to 2.1.3-rtm-15796 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 9998f36c2d..6572c83114 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15795 -commithash:866028c9d39a52bbdef2ee6c1406493d1c0a0290 +version:2.1.3-rtm-15796 +commithash:bb5fcc49ee843d3be2ebd4cc879658db55fc79da From e293eae5f3067a1cc72bbb90eaa317ff2f08bf6a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 11:27:24 -0700 Subject: [PATCH 15/42] Updating submodule(s) Mvc => 335500ab0ed76e073514130068aab43a40ebba3e [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index c2fcfabdf3..335500ab0e 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit c2fcfabdf3f7bbcaaecbc77ecbfe358b3b7e0092 +Subproject commit 335500ab0ed76e073514130068aab43a40ebba3e From 8b39e984778a133a455ba4b17839c492a17b562b Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Mon, 2 Jul 2018 13:03:48 -0700 Subject: [PATCH 16/42] Add web.administation to universe (#1233) --- build/dependencies.props | 1 + build/external-dependencies.props | 1 + 2 files changed, 2 insertions(+) diff --git a/build/dependencies.props b/build/dependencies.props index 093df655c2..2b4d241910 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -118,6 +118,7 @@ 9.0.30729 7.10.6071 15.6.161-preview + 11.1.0 1.4.0 1.3.8 1.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index aa95e4b02b..65900209e5 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -102,6 +102,7 @@ + From d9b1731a57012c67a4fa24ef576a09fd778b7308 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 20:28:39 +0000 Subject: [PATCH 17/42] Updating submodule(s) EntityFrameworkCore => 93da2f0ccfca96f1cea677cad177d8cb6bbacaf0 IISIntegration => dfd75e939d49733fd8dcb0104a7b121671c467f6 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index ea9b3d84f9..93da2f0ccf 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit ea9b3d84f9028a8a5eb35ae02babd50836947163 +Subproject commit 93da2f0ccfca96f1cea677cad177d8cb6bbacaf0 diff --git a/modules/IISIntegration b/modules/IISIntegration index 65d3787fc4..dfd75e939d 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 65d3787fc483959166d9ecc75d392dcee7e90a2a +Subproject commit dfd75e939d49733fd8dcb0104a7b121671c467f6 From 272669c8bf0c15c86fbf81437bd11b5c5aaad0e6 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 21:10:14 +0000 Subject: [PATCH 18/42] Updating submodule(s) SignalR => 967db6d8e96228a95f130d18a1b8cb1cdcec7c56 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index b6c99069dd..967db6d8e9 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit b6c99069dde7009685ddbb390b4069aa31817a19 +Subproject commit 967db6d8e96228a95f130d18a1b8cb1cdcec7c56 From a8ff2dc9569aa4eaada4b0b3a42de7ff9aac72c9 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 23:03:15 +0000 Subject: [PATCH 19/42] Updating BuildTools from 2.2.0-preview1-17097 to 2.2.0-preview1-17098 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index ef66e5ff84..6562ee07a3 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17097 -commithash:d3892605bc92768edd40b857592c409dfc63932c +version:2.2.0-preview1-17098 +commithash:bdf89e168c117b9eb17272a44bd47ed6c4a876a2 From 55e0fd5677f35e821edcd4822352f2addb1c113a Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 2 Jul 2018 17:02:30 -0700 Subject: [PATCH 20/42] Fix the version override check for ProdCon builds --- build/dependencies.props | 1 - test/SharedFx.UnitTests/SharedFx.UnitTests.csproj | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index f0587a1537..bbc2910674 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -11,7 +11,6 @@ $(MicrosoftNETCoreAppPackageVersion) - $(MicrosoftNETCoreApp21PackageVersion) $(KoreBuildVersion) diff --git a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj index 31a39f032c..e574f7d305 100644 --- a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj +++ b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj @@ -24,7 +24,7 @@ <_Parameter1>MicrosoftNETCoreAppPackageVersion - <_Parameter2>$(MicrosoftNETCoreAppPackageVersion) + <_Parameter2>$(RuntimeFrameworkVersion) From b89b8c36ca67b09aa1d1aa0f327336208e5fae1d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 17:22:35 -0700 Subject: [PATCH 21/42] Updating submodule(s) IISIntegration => 9b7ee920289cf18fdcbd4e1b7d89d208835e9385 [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index dfd75e939d..9b7ee92028 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit dfd75e939d49733fd8dcb0104a7b121671c467f6 +Subproject commit 9b7ee920289cf18fdcbd4e1b7d89d208835e9385 From cccc1ff72e292bb28f2c5c9c0a90a156a0125956 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 2 Jul 2018 18:25:48 -0700 Subject: [PATCH 22/42] Updating submodule(s) IISIntegration => 3efc1eede43ac046f4956838db90095402b26eb2 [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 9b7ee92028..3efc1eede4 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 9b7ee920289cf18fdcbd4e1b7d89d208835e9385 +Subproject commit 3efc1eede43ac046f4956838db90095402b26eb2 From d2d9a47686585364350353221ee63c5dc591f947 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 3 Jul 2018 10:08:25 -0700 Subject: [PATCH 23/42] Invoke dotnet vstest directly instead of using the VSTest target Attempt to workaround Microsoft/vstest#1503 which causes test failure output to be swallowed --- build/SharedFx.targets | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/build/SharedFx.targets b/build/SharedFx.targets index ed0bb6cf96..2c206a87b1 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -540,9 +540,24 @@ RepositoryCommit=$(RepositoryCommit); SharedFxRuntimeIdentifier=$(SharedFXRid) + $(LogOutputDir)SharedFx.UnitTests-$(BuildNumber).trx - + + + + + + + + + From 218cb74edcb9d13e1fa4f53334d6d849be5a3021 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 10:54:59 -0700 Subject: [PATCH 24/42] Updating BuildTools from 2.1.3-rtm-15796 to 2.1.3-rtm-15797 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 6572c83114..8d72cdc036 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15796 -commithash:bb5fcc49ee843d3be2ebd4cc879658db55fc79da +version:2.1.3-rtm-15797 +commithash:d1b6240ad6605601afe9aa993d7bedb1a00c4cb2 From 5717594bafd148fe03cd63d603395e0f11aacf86 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 11:50:51 -0700 Subject: [PATCH 25/42] Updating BuildTools from 2.1.3-rtm-15797 to 2.1.3-rtm-15799 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 8d72cdc036..ccb5adf875 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.3-rtm-15797 -commithash:d1b6240ad6605601afe9aa993d7bedb1a00c4cb2 +version:2.1.3-rtm-15799 +commithash:48ea43fbffa6c3d0fc8b51dbbaf69ce52b26da7c From c95c92e2fed60d955f414a5449b5d4f10f2fca2b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 11:50:51 -0700 Subject: [PATCH 26/42] Updating submodule(s) SignalR => b7f666e91b4c9ab29e2f8ac44bb894eb5ac8fa7b [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 967db6d8e9..b7f666e91b 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 967db6d8e96228a95f130d18a1b8cb1cdcec7c56 +Subproject commit b7f666e91b4c9ab29e2f8ac44bb894eb5ac8fa7b From a7811c56562699035f4fac7715428a5426d8c719 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 3 Jul 2018 11:14:40 -0700 Subject: [PATCH 27/42] Ensure .NET Core runtimes are install in alpine builds to tests can run --- build/SharedFx.targets | 2 +- build/docker/alpine.Dockerfile | 11 ----------- build/repo.props | 2 +- dockerbuild.sh | 7 ------- 4 files changed, 2 insertions(+), 20 deletions(-) diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 2c206a87b1..594e914840 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -530,7 +530,7 @@ - + $(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index 4dcc47505c..ae9cbab56f 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -25,14 +25,3 @@ ENV LANG en_US.UTF-8 # Skip package initilization ENV DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1 - -# Workarounds https://github.com/dotnet/cli/issues/8738 -ENV DOTNET_INSTALL_SKIP_PREREQS=1 -ENV KOREBUILD_SKIP_RUNTIME_INSTALL=1 - -COPY global.json /tmp/global.json -RUN DOTNET_SDK_VERSION="$(jq -r '.sdk.version' /tmp/global.json)" \ - && echo "Installing SDK ${DOTNET_SDK_VERSION}" \ - && wget -q --tries 10 -O /tmp/dotnet.tar.gz https://dotnetcli.blob.core.windows.net/dotnet/Sdk/$DOTNET_SDK_VERSION/dotnet-sdk-$DOTNET_SDK_VERSION-linux-musl-x64.tar.gz \ - && mkdir -p "$HOME/.dotnet" \ - && tar xzf /tmp/dotnet.tar.gz -C "$HOME/.dotnet" diff --git a/build/repo.props b/build/repo.props index eab83a9e31..f4a27e3115 100644 --- a/build/repo.props +++ b/build/repo.props @@ -43,7 +43,7 @@ - + Date: Tue, 3 Jul 2018 12:55:55 -0700 Subject: [PATCH 28/42] Updating submodule(s) SignalR => 229bc12db14b5d4581a67c9714d1f634a32338d1 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index b7f666e91b..229bc12db1 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit b7f666e91b4c9ab29e2f8ac44bb894eb5ac8fa7b +Subproject commit 229bc12db14b5d4581a67c9714d1f634a32338d1 From 341339cd6176939f0c9ee91f0ce0216924f074dd Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 14:52:04 -0700 Subject: [PATCH 29/42] Updating submodule(s) EntityFrameworkCore => 3d2ba391cc1d8d6cc7b0a67ced4539067ad07a64 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 93da2f0ccf..3d2ba391cc 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 93da2f0ccfca96f1cea677cad177d8cb6bbacaf0 +Subproject commit 3d2ba391cc1d8d6cc7b0a67ced4539067ad07a64 From 0a0ad5f605be94163ffc91e13f25b263f6ab5007 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 22:47:32 +0000 Subject: [PATCH 30/42] Updating submodule(s) EntityFrameworkCore => 1ccc2fa6c2e0d861441cccc1fae4307e68ac363e [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 3d2ba391cc..1ccc2fa6c2 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 3d2ba391cc1d8d6cc7b0a67ced4539067ad07a64 +Subproject commit 1ccc2fa6c2e0d861441cccc1fae4307e68ac363e From e2f55d1697199cb1aa81421a0ca8a3793b0bdc7c Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 16:47:55 -0700 Subject: [PATCH 31/42] Updating submodule(s) IISIntegration => e7d36a42e6b7b96451e38c6142445fe0371c1f91 [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 3efc1eede4..e7d36a42e6 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 3efc1eede43ac046f4956838db90095402b26eb2 +Subproject commit e7d36a42e6b7b96451e38c6142445fe0371c1f91 From 7b00c7739126c5699223fc2c362f94ebd759d87b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 4 Jul 2018 00:02:08 +0000 Subject: [PATCH 32/42] Updating submodule(s) Templating => 727bd52b64a022fda0db882fb74bf2d434a17ea4 [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index a6b303c83c..727bd52b64 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit a6b303c83c1cd4d4e0d302e07064713eafa3ed39 +Subproject commit 727bd52b64a022fda0db882fb74bf2d434a17ea4 From a46289466dc56b162ae438f6a9279af1e9471e4a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 3 Jul 2018 17:18:33 -0700 Subject: [PATCH 33/42] Updating submodule(s) IISIntegration => 724cc3ce88233fa37a01fe447afed2c00c6711bf [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index e7d36a42e6..724cc3ce88 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit e7d36a42e6b7b96451e38c6142445fe0371c1f91 +Subproject commit 724cc3ce88233fa37a01fe447afed2c00c6711bf From c43a1b1ed07b2d211e33d18b2d6268372182347e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 4 Jul 2018 01:15:01 +0000 Subject: [PATCH 34/42] Updating submodule(s) Templating => 263e369b2ef121ba77b5ff1ad582a1899fb5fe8a [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index 96adddcbca..263e369b2e 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 96adddcbca01dde3f89a23329f7832568170027f +Subproject commit 263e369b2ef121ba77b5ff1ad582a1899fb5fe8a From 767254ad030152f3ec2a1a9baaf3a416acfd75ee Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 4 Jul 2018 01:15:03 +0000 Subject: [PATCH 35/42] Updating BuildTools from 2.2.0-preview1-17098 to 2.2.0-preview1-17099 [auto-updated: buildtools] --- korebuild-lock.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 6562ee07a3..27e2e80f9a 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview1-17098 -commithash:bdf89e168c117b9eb17272a44bd47ed6c4a876a2 +version:2.2.0-preview1-17099 +commithash:263ed1db9866b6b419b1f5d5189a712aa218acb3 From 73867a086ccb35d52031c71de47c71e3f33279dc Mon Sep 17 00:00:00 2001 From: Justin Kotalik Date: Thu, 5 Jul 2018 10:10:39 -0700 Subject: [PATCH 36/42] IIS-Inproc new project cap (#1238) --- .../build/netcoreapp2.2/Microsoft.AspNetCore.App.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props b/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props index b45f971fa7..b68699c5b3 100644 --- a/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props +++ b/src/Microsoft.AspNetCore.App/build/netcoreapp2.2/Microsoft.AspNetCore.App.props @@ -15,7 +15,7 @@ Capability that enables Visual Studio support for hosting Asp.Net Core applications in the IIS process --> - + From 62ea0264e4ab3f58850f7bc61d506d7485d98c61 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 5 Jul 2018 10:14:35 -0700 Subject: [PATCH 37/42] Ensure trx logging is reported correctly when building in TeamCity --- build/SharedFx.targets | 15 +++++++++++---- dockerbuild.sh | 3 ++- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 594e914840..2fbdc33202 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -530,9 +530,17 @@ + $(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj + + + $(LogOutputDir)SharedFx-UnitTests-$(Version).trx + + $(UnitTestFxTrxLogFile) + $(HostMachineRepositoryRoot)/artifacts/logs/SharedFx-UnitTests.trx + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); @@ -540,7 +548,6 @@ RepositoryCommit=$(RepositoryCommit); SharedFxRuntimeIdentifier=$(SharedFXRid) - $(LogOutputDir)SharedFx.UnitTests-$(BuildNumber).trx @@ -548,15 +555,15 @@ - + Condition="'$(TEAMCITY_VERSION)' != '' AND Exists('$(UnitTestFxTrxLogFile)')" /> diff --git a/dockerbuild.sh b/dockerbuild.sh index a3f61b7a17..d401522921 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -108,4 +108,5 @@ docker run \ ${docker_args[@]+"${docker_args[@]}"} \ $tagname \ ./build.sh \ - ${build_args[@]+"${build_args[@]}"} + ${build_args[@]+"${build_args[@]}"} \ + "-p:HostMachineRepositoryRoot=$DIR" From 2155c49e339d4680327a3145e7b617c7889207f2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 5 Jul 2018 11:11:27 -0700 Subject: [PATCH 38/42] Updating submodule(s) EntityFrameworkCore => dc8ab14e739823ff6ef42b3f099c91ee4197745a [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 1ccc2fa6c2..dc8ab14e73 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 1ccc2fa6c2e0d861441cccc1fae4307e68ac363e +Subproject commit dc8ab14e739823ff6ef42b3f099c91ee4197745a From 6a459bb7954d53b642fd3554c1fab0628255039d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 5 Jul 2018 18:42:17 +0000 Subject: [PATCH 39/42] Updating submodule(s) DataProtection => 2af13658fcd601f951ed9ff60446b7a5241efbab [auto-updated: submodules] --- modules/DataProtection | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/DataProtection b/modules/DataProtection index a5c86afe7d..2af13658fc 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit a5c86afe7d61e90ab7540008e52390fbcf938447 +Subproject commit 2af13658fcd601f951ed9ff60446b7a5241efbab From 7ef6f14b2956c07d7ea5c33e28b2faf956f91fa2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 5 Jul 2018 12:56:47 -0700 Subject: [PATCH 40/42] Updating submodule(s) SignalR => 475700209abf40ecd51b4f511b29717de59c134d [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 6c0770398d..475700209a 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 6c0770398de0221ac0fc30550aec9a9f649e9317 +Subproject commit 475700209abf40ecd51b4f511b29717de59c134d From 8f6bf24e4a36a337e63b9df117dfa1ee6405bab8 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 5 Jul 2018 13:29:09 -0700 Subject: [PATCH 41/42] Updating submodule(s) SignalR => b4fdc5e5c0d7c58ca86d25298c84e100e4d7e1c0 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 229bc12db1..b4fdc5e5c0 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 229bc12db14b5d4581a67c9714d1f634a32338d1 +Subproject commit b4fdc5e5c0d7c58ca86d25298c84e100e4d7e1c0 From cd449cef2b533e925ad26530d2fbb117427dbf04 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 5 Jul 2018 14:56:52 -0700 Subject: [PATCH 42/42] Update xunit.runner.visualstudio to 2.4.0-rc.1.build4038 --- build/dependencies.props | 2 +- build/sources.props | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index bbc2910674..5bc3bb91b7 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -149,6 +149,6 @@ 2.3.1 2.3.1 2.3.1 - 2.4.0-beta.1.build3945 + 2.4.0-rc.1.build4038 diff --git a/build/sources.props b/build/sources.props index 9570c654ac..5b458ddf09 100644 --- a/build/sources.props +++ b/build/sources.props @@ -19,8 +19,7 @@ https://dotnet.myget.org/F/aspnetcore-master/api/v3/index.json; https://dotnet.myget.org/F/roslyn/api/v3/index.json; https://vside.myget.org/F/vssdk/api/v3/index.json; - https://vside.myget.org/F/vsmac/api/v3/index.json; - https://www.myget.org/F/xunit/api/v3/index.json; + https://vside.myget.org/F/vsmac/api/v3/index.json