From d2324fae73b73bcb5246df8b3fa14f632968cb1d Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Mon, 19 Mar 2018 13:25:35 -0700 Subject: [PATCH 01/18] Update AuthSamples & Identity --- modules/AuthSamples | 2 +- modules/Identity | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/AuthSamples b/modules/AuthSamples index f906321f40..a3772fed65 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit f906321f40a6bc5bb183def387916aee2a4f842f +Subproject commit a3772fed6567eacd989ff033355102d8ddeb1a75 diff --git a/modules/Identity b/modules/Identity index ecd9ff6c06..4f5b3bea98 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit ecd9ff6c06f93240e0d7bfc272a92788e6a6bc13 +Subproject commit 4f5b3bea98ad6fa175782b505090895381c41728 From c755760cd3bdd34297fb5fe8476757c3bc7d71df Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 19 Mar 2018 23:04:27 +0000 Subject: [PATCH 02/18] Updating submodule(s) AuthSamples => 90eca80e0bb19d37dfe9791aeced8758b280ead4 CORS => 3edca24004ea69af6d582064669cdd8aa709bf6e DataProtection => 5e9dd7a5fc085914fda8632e74743053ee3c5ef4 DependencyInjection => bfd43604e9d1fb5f5a41cfffd76332bdcd2593b7 EntityFrameworkCore => 3a5b2d7afb361b874b6b5457c4988b8b7209cfdb Identity => 9fda68e9dbb73eee095f3b00660c19a4e3421600 IISIntegration => 2bb9a8aaf950d27def213b800b0712b040293161 Microsoft.Data.Sqlite => a0bb119140ef226aaacad6f055032e49b8706c2a Mvc => 390ebbb258215137a1cb493d2170eda9249d4afe Razor => d72e914fe9de8d22d2b4443d493dbdf4badfc533 Routing => dc07aba9355c137361dfa3f8a50df61949cd3eaf SignalR => 85b12e9fa18193c81c930032dc14755805b71c8e StaticFiles => 7c50704c69fd3dab641d7c0077b6acb7cf7885f8 Templating => 79b4cafe68f7b00bc56e37320609a9870cab9dc4 [auto-updated: submodules] --- modules/AuthSamples | 2 +- modules/CORS | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/EntityFrameworkCore | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/Microsoft.Data.Sqlite | 2 +- modules/Mvc | 2 +- modules/Razor | 2 +- modules/Routing | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/modules/AuthSamples b/modules/AuthSamples index a3772fed65..90eca80e0b 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit a3772fed6567eacd989ff033355102d8ddeb1a75 +Subproject commit 90eca80e0bb19d37dfe9791aeced8758b280ead4 diff --git a/modules/CORS b/modules/CORS index 6855143c50..3edca24004 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 6855143c5003244715c32069e79ddf0709b0152f +Subproject commit 3edca24004ea69af6d582064669cdd8aa709bf6e diff --git a/modules/DataProtection b/modules/DataProtection index f5e790298a..5e9dd7a5fc 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit f5e790298aeb96649f5e60a8ae2443cf9d90c0e8 +Subproject commit 5e9dd7a5fc085914fda8632e74743053ee3c5ef4 diff --git a/modules/DependencyInjection b/modules/DependencyInjection index a91b9c8994..bfd43604e9 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit a91b9c8994114313d63d676ad5e2289eb1c4749d +Subproject commit bfd43604e9d1fb5f5a41cfffd76332bdcd2593b7 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index c87fc69d4b..3a5b2d7afb 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit c87fc69d4bc0c085945d22d37f99651271238f58 +Subproject commit 3a5b2d7afb361b874b6b5457c4988b8b7209cfdb diff --git a/modules/IISIntegration b/modules/IISIntegration index cf4874997e..2bb9a8aaf9 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit cf4874997eec8ce11a66b03856772737dec5a4c4 +Subproject commit 2bb9a8aaf950d27def213b800b0712b040293161 diff --git a/modules/Identity b/modules/Identity index 4f5b3bea98..9fda68e9db 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 4f5b3bea98ad6fa175782b505090895381c41728 +Subproject commit 9fda68e9dbb73eee095f3b00660c19a4e3421600 diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index bc5e37298b..a0bb119140 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit bc5e37298b7b077ec4217809322b946596fffc11 +Subproject commit a0bb119140ef226aaacad6f055032e49b8706c2a diff --git a/modules/Mvc b/modules/Mvc index f85be6a0c0..390ebbb258 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit f85be6a0c091abc80e6ab8f6d15a81d5ae4794b9 +Subproject commit 390ebbb258215137a1cb493d2170eda9249d4afe diff --git a/modules/Razor b/modules/Razor index 6fa415b67c..d72e914fe9 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 6fa415b67cace9f8a4f44a2283f824cee7322056 +Subproject commit d72e914fe9de8d22d2b4443d493dbdf4badfc533 diff --git a/modules/Routing b/modules/Routing index 748176ec4c..dc07aba935 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 748176ec4c7317728c91276df1bdfc108b965404 +Subproject commit dc07aba9355c137361dfa3f8a50df61949cd3eaf diff --git a/modules/SignalR b/modules/SignalR index cf7c8629ff..85b12e9fa1 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit cf7c8629ff6244711cb4da7c6e5518a30e2fe177 +Subproject commit 85b12e9fa18193c81c930032dc14755805b71c8e diff --git a/modules/StaticFiles b/modules/StaticFiles index 88f62e5ef3..7c50704c69 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 88f62e5ef3b6d1583a3ce43d9acb08bf57e72e1f +Subproject commit 7c50704c69fd3dab641d7c0077b6acb7cf7885f8 diff --git a/modules/Templating b/modules/Templating index feaf8168b1..79b4cafe68 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit feaf8168b12de2516d3776f82d250c259f48b743 +Subproject commit 79b4cafe68f7b00bc56e37320609a9870cab9dc4 From b66258bd870076bd82c04f304c8f54841843720f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 00:14:09 +0000 Subject: [PATCH 03/18] Updating submodule(s) MusicStore => 1564b1e83ae7d336e424fd2877d0f4d099beaf9f Razor => fab70c81ec70b6ce32119d0d76b567fa32894172 Templating => cbdc7bd3b8dc297569325edfc9f3b41f14e3915a [auto-updated: submodules] --- modules/MusicStore | 2 +- modules/Razor | 2 +- modules/Templating | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/MusicStore b/modules/MusicStore index 8f9832119f..1564b1e83a 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit 8f9832119fd33f21500e2bfa6791bfab274e1118 +Subproject commit 1564b1e83ae7d336e424fd2877d0f4d099beaf9f diff --git a/modules/Razor b/modules/Razor index d72e914fe9..fab70c81ec 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit d72e914fe9de8d22d2b4443d493dbdf4badfc533 +Subproject commit fab70c81ec70b6ce32119d0d76b567fa32894172 diff --git a/modules/Templating b/modules/Templating index 79b4cafe68..cbdc7bd3b8 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 79b4cafe68f7b00bc56e37320609a9870cab9dc4 +Subproject commit cbdc7bd3b8dc297569325edfc9f3b41f14e3915a From c07ac52ba42d99eef86ab1c59493cf3b7a6b7e41 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 01:20:33 +0000 Subject: [PATCH 04/18] Updating submodule(s) EntityFrameworkCore => 9a4b81ab1fea93465ec375c9ef816dafd4716057 Identity => 910da898820fb0b29d000b7fd1497cd325ee17d1 SignalR => 9992e48c60a1958c42524fac1a7fa0482a2c0072 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/Identity | 2 +- modules/SignalR | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 3a5b2d7afb..9a4b81ab1f 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 3a5b2d7afb361b874b6b5457c4988b8b7209cfdb +Subproject commit 9a4b81ab1fea93465ec375c9ef816dafd4716057 diff --git a/modules/Identity b/modules/Identity index 9fda68e9db..910da89882 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 9fda68e9dbb73eee095f3b00660c19a4e3421600 +Subproject commit 910da898820fb0b29d000b7fd1497cd325ee17d1 diff --git a/modules/SignalR b/modules/SignalR index 85b12e9fa1..9992e48c60 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 85b12e9fa18193c81c930032dc14755805b71c8e +Subproject commit 9992e48c60a1958c42524fac1a7fa0482a2c0072 From 77e136e80ad304ecf2b74210b1b622ee5a33f7c2 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 02:19:31 +0000 Subject: [PATCH 05/18] Updating submodule(s) Razor => c934bd08ac1b258d4691cc583e0b42dc0d295bac [auto-updated: submodules] --- modules/Razor | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Razor b/modules/Razor index fab70c81ec..c934bd08ac 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit fab70c81ec70b6ce32119d0d76b567fa32894172 +Subproject commit c934bd08ac1b258d4691cc583e0b42dc0d295bac From 2a8214776bae1dff656ce0381e8b31920ca46208 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 03:26:46 +0000 Subject: [PATCH 06/18] Updating submodule(s) SignalR => 71fd4ffd8af7bd67f3df906836d16c9f870d4cf0 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 9992e48c60..71fd4ffd8a 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 9992e48c60a1958c42524fac1a7fa0482a2c0072 +Subproject commit 71fd4ffd8af7bd67f3df906836d16c9f870d4cf0 From a71493bf7d498ae8da146b56254ad448396c575f Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 19 Mar 2018 21:55:26 -0700 Subject: [PATCH 07/18] Updating submodule(s) Razor => 2bc3466e3d736cd200dc4910429eea82346bd31c SignalR => 4f10560087b2dc22e1450efb98c979e8db5eddfd [auto-updated: submodules] --- modules/Razor | 2 +- modules/SignalR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Razor b/modules/Razor index c934bd08ac..2bc3466e3d 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit c934bd08ac1b258d4691cc583e0b42dc0d295bac +Subproject commit 2bc3466e3d736cd200dc4910429eea82346bd31c diff --git a/modules/SignalR b/modules/SignalR index 71fd4ffd8a..4f10560087 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 71fd4ffd8af7bd67f3df906836d16c9f870d4cf0 +Subproject commit 4f10560087b2dc22e1450efb98c979e8db5eddfd From e50654acc354324f26f8624f6e478b749c88335b Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 19 Mar 2018 23:00:48 -0700 Subject: [PATCH 08/18] Updating submodule(s) SignalR => b91499b2fc0f52ec6e9b8d03f4e707bb27499c6f [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 4f10560087..b91499b2fc 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 4f10560087b2dc22e1450efb98c979e8db5eddfd +Subproject commit b91499b2fc0f52ec6e9b8d03f4e707bb27499c6f From 10f92953bc0664c351f842ff392bed22adb73a84 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 15:35:58 +0000 Subject: [PATCH 09/18] Updating submodule(s) SignalR => 885679c8bdab51637366bf1285ab5e35a3d0d518 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index b91499b2fc..885679c8bd 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit b91499b2fc0f52ec6e9b8d03f4e707bb27499c6f +Subproject commit 885679c8bdab51637366bf1285ab5e35a3d0d518 From 6dab43da2851a520164a73562de9d6f55ea52564 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 09:25:44 -0700 Subject: [PATCH 10/18] Updating submodule(s) IISIntegration => f1d8ca30459ea452a5b840432a687a6bf76d401e [auto-updated: submodules] --- modules/IISIntegration | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 2bb9a8aaf9..f1d8ca3045 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 2bb9a8aaf950d27def213b800b0712b040293161 +Subproject commit f1d8ca30459ea452a5b840432a687a6bf76d401e From 942bbb21d33e50975d5e81f3db2cf25b2903c1d7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 17:31:09 +0000 Subject: [PATCH 11/18] Updating submodule(s) Identity => 56666e349c4655e43923ab7ed2f5808e827d6acd Razor => 5f3908cb54adde6ad24e4202638d0839550aabb7 [auto-updated: submodules] --- modules/Identity | 2 +- modules/Razor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/Identity b/modules/Identity index 910da89882..56666e349c 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 910da898820fb0b29d000b7fd1497cd325ee17d1 +Subproject commit 56666e349c4655e43923ab7ed2f5808e827d6acd diff --git a/modules/Razor b/modules/Razor index 2bc3466e3d..5f3908cb54 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 2bc3466e3d736cd200dc4910429eea82346bd31c +Subproject commit 5f3908cb54adde6ad24e4202638d0839550aabb7 From 18fa0b902ae51af8cc1e2735895bf9e284b83694 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 18:40:09 +0000 Subject: [PATCH 12/18] Updating submodule(s) Templating => f786df9dc946f2d6e0362c2c9fc72579014d83d9 [auto-updated: submodules] --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index cbdc7bd3b8..f786df9dc9 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit cbdc7bd3b8dc297569325edfc9f3b41f14e3915a +Subproject commit f786df9dc946f2d6e0362c2c9fc72579014d83d9 From 8328f1bf26fcc8668ab9c10a1a422ec562f2939e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 19:15:42 +0000 Subject: [PATCH 13/18] Updating submodule(s) Configuration => 142371f9be551fb3b6f4a5b403778cd2f6c76179 Diagnostics => 424c0b02097b3ad6331a9df86aeadbc7c60bf04b HttpAbstractions => f91db5b7943c011533b4ae3a9351f9cd4ebfb4d5 Identity => e233e60e6f2886dc41b10307c1b670e0aaabf499 Localization => a5ffd9b7e674a704e6fec1ae007a9ff4e9424310 ResponseCaching => 07db6cc038be62a0dd604b9e530a7159e76aab52 SignalR => 88b1cff27392487e224342d978781ad9b337d023 [auto-updated: submodules] --- modules/Configuration | 2 +- modules/Diagnostics | 2 +- modules/HttpAbstractions | 2 +- modules/Identity | 2 +- modules/Localization | 2 +- modules/ResponseCaching | 2 +- modules/SignalR | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/Configuration b/modules/Configuration index be8e1a87ac..142371f9be 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit be8e1a87ac077fddb01ed88ec995311752156faa +Subproject commit 142371f9be551fb3b6f4a5b403778cd2f6c76179 diff --git a/modules/Diagnostics b/modules/Diagnostics index d9cd271d15..424c0b0209 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit d9cd271d15b3448ea2bf085061f4ccaf669473ed +Subproject commit 424c0b02097b3ad6331a9df86aeadbc7c60bf04b diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index f6f89554c9..f91db5b794 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit f6f89554c9245716115fc7b87c32ae628f7fe0f4 +Subproject commit f91db5b7943c011533b4ae3a9351f9cd4ebfb4d5 diff --git a/modules/Identity b/modules/Identity index 56666e349c..e233e60e6f 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 56666e349c4655e43923ab7ed2f5808e827d6acd +Subproject commit e233e60e6f2886dc41b10307c1b670e0aaabf499 diff --git a/modules/Localization b/modules/Localization index 018cd00e28..a5ffd9b7e6 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit 018cd00e28aedc654644e18acfe1239ea092d90f +Subproject commit a5ffd9b7e674a704e6fec1ae007a9ff4e9424310 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 7e28614391..07db6cc038 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 7e28614391c759ea7164718d5ee79074b7e31cee +Subproject commit 07db6cc038be62a0dd604b9e530a7159e76aab52 diff --git a/modules/SignalR b/modules/SignalR index 885679c8bd..88b1cff273 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 885679c8bdab51637366bf1285ab5e35a3d0d518 +Subproject commit 88b1cff27392487e224342d978781ad9b337d023 From b6118fd4dcdaffcd4f7cf31e0bc83bdd6a73e979 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 20 Mar 2018 13:25:16 -0700 Subject: [PATCH 14/18] Updating submodule(s) EntityFrameworkCore => fdb8eceb74a3fd585f90eced744977f74477b1dd [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 9a4b81ab1f..fdb8eceb74 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 9a4b81ab1fea93465ec375c9ef816dafd4716057 +Subproject commit fdb8eceb74a3fd585f90eced744977f74477b1dd From fde11611f8b40f3f101a99822bb9449d338cb002 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 20 Mar 2018 15:23:21 -0700 Subject: [PATCH 15/18] Fix the latest version pointer file in the blob store --- build/Publish.targets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/Publish.targets b/build/Publish.targets index 4ac2bb7eb2..8a84d9deec 100644 --- a/build/Publish.targets +++ b/build/Publish.targets @@ -6,7 +6,7 @@ aspnetcore_base_runtime.version $(IntermediateDir)$(BaseRuntimeVersionFileName) - latest.aspnetcore.version + latest.version $(IntermediateDir)$(LatestRuntimeVersionFileName) From 5aa5f92345fe02840f66ea692331335ce05580be Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 20 Mar 2018 16:17:59 -0700 Subject: [PATCH 16/18] Adjust docker build to use current user ID (#977) --- build/docker/alpine.Dockerfile | 13 ++++++++++--- dockerbuild.sh | 7 ++++++- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/build/docker/alpine.Dockerfile b/build/docker/alpine.Dockerfile index bd4f99478a..1f80997905 100644 --- a/build/docker/alpine.Dockerfile +++ b/build/docker/alpine.Dockerfile @@ -1,5 +1,11 @@ FROM microsoft/dotnet:2.1-runtime-deps-alpine +ARG USER +ARG USER_ID +ARG GROUP_ID + WORKDIR /code/build +RUN mkdir -p "/home/$USER" && chown "${USER_ID}:${GROUP_ID}" "/home/$USER" +ENV HOME "/home/$USER" RUN apk add --no-cache \ bash \ @@ -10,6 +16,8 @@ RUN apk add --no-cache \ icu-libs \ openssl +USER $USER_ID:$GROUP_ID + # Disable the invariant mode (set in base image) ENV DOTNET_SYSTEM_GLOBALIZATION_INVARIANT false ENV LC_ALL en_US.UTF-8 @@ -26,6 +34,5 @@ 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-alpine.3.6-x64.tar.gz \ - && mkdir -p /usr/share/dotnet \ - && tar xzf /tmp/dotnet.tar.gz -C /usr/share/dotnet \ - && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet + && mkdir -p "$HOME/.dotnet" \ + && tar xzf /tmp/dotnet.tar.gz -C "$HOME/.dotnet" diff --git a/dockerbuild.sh b/dockerbuild.sh index da7c76ea9d..cb62311488 100755 --- a/dockerbuild.sh +++ b/dockerbuild.sh @@ -97,7 +97,12 @@ tagname="universe-build-$image" cp "$DIR/global.json" "$(dirname "$dockerfile")" #endworkaround -docker build "$(dirname "$dockerfile")" -f "$dockerfile" --tag $tagname +docker build "$(dirname "$dockerfile")" \ + --build-arg "USER=$(whoami)" \ + --build-arg "USER_ID=$(id -u)" \ + --build-arg "GROUP_ID=$(id -g)" \ + --tag $tagname \ + -f "$dockerfile" docker run \ --rm \ From 72d706526e12f8c1b3d5322e0b3cf5cf8e12b55a Mon Sep 17 00:00:00 2001 From: Mike Harder Date: Tue, 20 Mar 2018 16:32:00 -0700 Subject: [PATCH 17/18] Upgrade Microsoft.NET.Test.Sdk to 15.6.1 (#972) --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 6aa516ec04..d32645a7ff 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -144,7 +144,7 @@ 1.1.2 2.0.0 1.0.1 - 15.6.0 + 15.6.1 3.0.1 3.0.1 3.0.1 From 53a66b5ce83582c3ee64940a9e684dfbcb0f9f0f Mon Sep 17 00:00:00 2001 From: Kiran Challa Date: Tue, 20 Mar 2018 16:57:35 -0700 Subject: [PATCH 18/18] Removed Microsoft.AspNetCore.SpaTemplates from artifacts as its no longer produced --- build/artifacts.props | 1 - 1 file changed, 1 deletion(-) diff --git a/build/artifacts.props b/build/artifacts.props index 2a3b4201c6..8884c08821 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -170,7 +170,6 @@ -