From 4ba777a22a87a2c5b09ff3fc1abe8433b50aac6a Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 13:19:48 -0700 Subject: [PATCH 01/18] Updating submodule(s) KestrelHttpServer => 5bd2a415177c4a0cbe349e459966343934c49700 [auto-updated: submodules] --- modules/KestrelHttpServer | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 21e9c12b627..5bd2a415177 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 21e9c12b627dc2058a978da93e33827237a89fcc +Subproject commit 5bd2a415177c4a0cbe349e459966343934c49700 From 57b8e28d16092db2635ad99069f6e8747992c4f0 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 13:20:04 -0700 Subject: [PATCH 02/18] Updating BuildTools from 2.2.0-preview2-20181001.5 to 2.2.0-preview2-20181003.2 [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 b0fb62f1ee8..783131ae5eb 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181001.5 -commithash:89ae11d9237d412447f9ee4d5db6d7edf176f8df +version:2.2.0-preview2-20181003.2 +commithash:41935e62d7853060283c801f49992e2c73a95927 From 76f13103db25f74e0761f5be94b3fd2f39d95855 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 21:20:53 +0000 Subject: [PATCH 03/18] Updating submodule(s) SignalR => 2e41a7063b8731676cdc180277a4e137ddb2394b [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 6f45d308ce4..2e41a7063b8 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 6f45d308ce469243418093661f20d10636e03906 +Subproject commit 2e41a7063b8731676cdc180277a4e137ddb2394b From a0f6517f8e2b11dc42949791eca7e1ade9246294 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 21:54:30 +0000 Subject: [PATCH 04/18] Updating submodule(s) SignalR => 1ccb889f9c57b9c8c1d3f6d3a35aeda4b29af6fd [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 2e41a7063b8..1ccb889f9c5 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 2e41a7063b8731676cdc180277a4e137ddb2394b +Subproject commit 1ccb889f9c57b9c8c1d3f6d3a35aeda4b29af6fd From 25e2fde0aec288a3c4a0b976bf361a98de28b415 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 15:35:25 -0700 Subject: [PATCH 05/18] Updating submodule(s) SignalR => f02e13fa09ed6d1e3aa10e79d7105702631850ab [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 1ccb889f9c5..f02e13fa09e 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 1ccb889f9c57b9c8c1d3f6d3a35aeda4b29af6fd +Subproject commit f02e13fa09ed6d1e3aa10e79d7105702631850ab From be6fb9b62a35108bfeed780e9e23ebc93ed685f7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 16:19:20 -0700 Subject: [PATCH 06/18] Updating submodule(s) IISIntegration => a2d5d7a53ef53c3dea27d97e6de29a0f5f1e9411 SignalR => 420c1d507d36ca7b5c27cfe12d5cccb32c409d07 [auto-updated: submodules] --- modules/IISIntegration | 2 +- modules/SignalR | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/IISIntegration b/modules/IISIntegration index 4cbc969cd02..a2d5d7a53ef 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 4cbc969cd02700f7fccb8545ba9194fbf0bd8444 +Subproject commit a2d5d7a53ef53c3dea27d97e6de29a0f5f1e9411 diff --git a/modules/SignalR b/modules/SignalR index f02e13fa09e..420c1d507d3 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit f02e13fa09ed6d1e3aa10e79d7105702631850ab +Subproject commit 420c1d507d36ca7b5c27cfe12d5cccb32c409d07 From 4ba404321a1644fea62694e2bec56c044d775856 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 00:19:19 +0000 Subject: [PATCH 07/18] Updating submodule(s) EntityFrameworkCore => 8f76f6ef0152b347e51cd3a46c7925644175f8b1 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index a3f0a78c41f..8f76f6ef015 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit a3f0a78c41fe209924f8fb39fc77c421236f1bbe +Subproject commit 8f76f6ef0152b347e51cd3a46c7925644175f8b1 From fe9844d52bdab791c938f8658b112ac3fe019ee4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 01:58:59 +0000 Subject: [PATCH 08/18] Updating submodule(s) Mvc => 7854d65c117ae3e67ee7be14a747f6ba66148d4e [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 70ddf15cbc9..7854d65c117 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 70ddf15cbc988a39048e696595a2e86e7c6c2d80 +Subproject commit 7854d65c117ae3e67ee7be14a747f6ba66148d4e From 27aab9b9e29c23efdb89c0b5d19369f42faf0a53 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 19:31:46 -0700 Subject: [PATCH 09/18] Updating submodule(s) SignalR => 2ccf79a91244b9137742055b7b6345076a378743 [auto-updated: submodules] --- modules/SignalR | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/SignalR b/modules/SignalR index 420c1d507d3..2ccf79a9124 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 420c1d507d36ca7b5c27cfe12d5cccb32c409d07 +Subproject commit 2ccf79a91244b9137742055b7b6345076a378743 From 628a3821bdffb56d1f16d116d80ffac3debfd42e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 21:53:04 -0700 Subject: [PATCH 10/18] Updating submodule(s) Mvc => 94101a9cde8e044a2c4fa2595c4926b1b2d151be [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 7854d65c117..94101a9cde8 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 7854d65c117ae3e67ee7be14a747f6ba66148d4e +Subproject commit 94101a9cde8e044a2c4fa2595c4926b1b2d151be From 24e14c9870a82fe8ad2e2c466a9f791675ef37f1 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 3 Oct 2018 22:25:35 -0700 Subject: [PATCH 11/18] Updating submodule(s) Mvc => e2594c6a2b0c32177be0058aab34d3c6dfe33322 [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 94101a9cde8..e2594c6a2b0 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 94101a9cde8e044a2c4fa2595c4926b1b2d151be +Subproject commit e2594c6a2b0c32177be0058aab34d3c6dfe33322 From 5d261e46ce5bcf0489386f215885909c67bb82c6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 4 Oct 2018 09:26:44 -0700 Subject: [PATCH 12/18] Support checked-in global.json files --- .gitignore | 1 - build/RepositoryBuild.targets | 4 ++++ global.json | 8 ++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 global.json diff --git a/.gitignore b/.gitignore index 9f2e95e1d89..ba949609e08 100644 --- a/.gitignore +++ b/.gitignore @@ -19,7 +19,6 @@ node_modules/ .r .w .deps -global.json msbuild.ProjectImports.zip .env scripts/tmp/ diff --git a/build/RepositoryBuild.targets b/build/RepositoryBuild.targets index 9ad38cd5c23..26cf8183544 100644 --- a/build/RepositoryBuild.targets +++ b/build/RepositoryBuild.targets @@ -86,6 +86,8 @@ $(RepositoryRoot)korebuild-lock.txt $(BuildRepositoryRoot)korebuild-lock.txt $(IntermediateDir)$(RepositoryToBuild)-korebuild-lock.txt + $(BuildRepositoryRoot)global.json + $(IntermediateDir)$(RepositoryToBuild)-global.json @@ -93,6 +95,7 @@ + @@ -100,6 +103,7 @@ + diff --git a/global.json b/global.json new file mode 100644 index 00000000000..b5a5299b581 --- /dev/null +++ b/global.json @@ -0,0 +1,8 @@ +{ + "sdk": { + "version": "2.2.100-preview2-009404" + }, + "msbuild-sdks": { + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181003.2" + } +} From b0b65a530a0bbf6e4af323a48cd52a5c6e7d1ad6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Thu, 4 Oct 2018 11:07:06 -0700 Subject: [PATCH 13/18] Support using Internal.AspNetCore.Sdk as an MSBuild SDK (#1452) * Add Microsoft.AspNetCore.BuildTools.ApiCheck as an external dependency * Move the global.json files temporarily to avoid loading the wrong version of Internal.AspNetCore.Sdk --- build/dependencies.props | 1 + build/external-dependencies.props | 1 + build/repo.targets | 7 +++++++ global.json | 2 +- korebuild-lock.txt | 4 ++-- modules/Scaffolding | 2 +- 6 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 1399f7c92e7..1289db7e623 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -14,6 +14,7 @@ $(MicrosoftNETCoreAppPackageVersion) + $(KoreBuildVersion) $(KoreBuildVersion) $(KoreBuildVersion) diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 536acd29901..61ad8e80bb5 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -19,6 +19,7 @@ + diff --git a/build/repo.targets b/build/repo.targets index 63af8766c3c..db936bb97ce 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -79,6 +79,8 @@ + + + + + + + Date: Thu, 4 Oct 2018 13:47:41 -0700 Subject: [PATCH 14/18] Updating submodule(s) EntityFrameworkCore => c599721a3f9bcc71a35f7e363bcb1e46ef92d8ba KestrelHttpServer => 35d35f22a36c9ba564889a355f09d95a8e5b78fe Mvc => 153165f9ad03fa735fd566023bb34c1b323d3e54 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/KestrelHttpServer | 2 +- modules/Mvc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 8f76f6ef015..c599721a3f9 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 8f76f6ef0152b347e51cd3a46c7925644175f8b1 +Subproject commit c599721a3f9bcc71a35f7e363bcb1e46ef92d8ba diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 5bd2a415177..35d35f22a36 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 5bd2a415177c4a0cbe349e459966343934c49700 +Subproject commit 35d35f22a36c9ba564889a355f09d95a8e5b78fe diff --git a/modules/Mvc b/modules/Mvc index e2594c6a2b0..153165f9ad0 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit e2594c6a2b0c32177be0058aab34d3c6dfe33322 +Subproject commit 153165f9ad03fa735fd566023bb34c1b323d3e54 From 5ec26815ac310059c6eaebebcac5386e0eb92fb1 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 13:47:51 -0700 Subject: [PATCH 15/18] Updating BuildTools from 2.2.0-preview2-20181004.1 to 2.2.0-preview2-20181004.4 [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 163fbc3e27f..05ff517d0c2 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181004.1 -commithash:20538607213e0d70ee0b3ae39c35e6d55cec8eda +version:2.2.0-preview2-20181004.4 +commithash:7c9fc51314be6aa1b4f5044e12cd7c7def4f64c1 From 987f07e163da5af49edc2aa080c60de3af6c46d9 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 21:59:11 +0000 Subject: [PATCH 16/18] Updating submodule(s) EntityFrameworkCore => 914357eb62e434be250f3a4f22d3b8a5a080f1a4 Razor => 82276ece2f258c6e977f1ad848da2add3bb6c859 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/Razor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index c599721a3f9..914357eb62e 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit c599721a3f9bcc71a35f7e363bcb1e46ef92d8ba +Subproject commit 914357eb62e434be250f3a4f22d3b8a5a080f1a4 diff --git a/modules/Razor b/modules/Razor index 5aad6c7b424..82276ece2f2 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 5aad6c7b4249b66c48d909c8d63426a58b7e65bf +Subproject commit 82276ece2f258c6e977f1ad848da2add3bb6c859 From 2c1e15cdafb820c8b64cf13a471e25fa05a1558e Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 22:29:57 +0000 Subject: [PATCH 17/18] Updating submodule(s) Mvc => 5bddd226a3fde72845a2e2f32dd81172e13d5c9c [auto-updated: submodules] --- modules/Mvc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Mvc b/modules/Mvc index 153165f9ad0..5bddd226a3f 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 153165f9ad03fa735fd566023bb34c1b323d3e54 +Subproject commit 5bddd226a3fde72845a2e2f32dd81172e13d5c9c From a59c61a976a713990953961fe163576e392584b4 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Thu, 4 Oct 2018 22:30:08 +0000 Subject: [PATCH 18/18] Updating BuildTools from 2.2.0-preview2-20181004.4 to 2.2.0-preview2-20181004.6 [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 05ff517d0c2..96fe3217ef9 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181004.4 -commithash:7c9fc51314be6aa1b4f5044e12cd7c7def4f64c1 +version:2.2.0-preview2-20181004.6 +commithash:c04c4b2f5018632647f96210ab01876661302dac