From c2e9ca24d3ded27303d5266a2215dda37052ace6 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 31 Oct 2018 10:04:25 -0700 Subject: [PATCH 1/3] Update build tools to 2.2.0-preview2-20181031.2 --- build/SharedFx.targets | 4 ++-- global.json | 12 ++++++------ korebuild-lock.txt | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/build/SharedFx.targets b/build/SharedFx.targets index f70618067c..84a2da2728 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -21,7 +21,7 @@ <_RestoreGraphProjectInput>@(ProjectToBuild) - $(SolutionProperties); + $(BuildProperties); SharedFxRid=$(SharedFxRid); DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath) @@ -53,7 +53,7 @@ $(HostMachineRepositoryRoot)/artifacts/logs/SharedFx-UnitTests.trx - + diff --git a/global.json b/global.json index b94cb5a81e..7372733c79 100644 --- a/global.json +++ b/global.json @@ -1,8 +1,8 @@ { - "sdk": { - "version": "2.2.100-rtm-009571" - }, - "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181029.2" + "sdk": { + "version": "2.2.100-rtm-009571" + }, + "msbuild-sdks": { + "Internal.AspNetCore.Sdk": "2.2.0-preview2-20181031.2" + } } -} diff --git a/korebuild-lock.txt b/korebuild-lock.txt index e1429e122e..e79edadb49 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.2.0-preview2-20181029.2 -commithash:d3fd31bc75010d3b5ee4cb9b55ebd383b0cd628c +version:2.2.0-preview2-20181031.2 +commithash:4c07148aca6305fe180792bdaefeb0a573b796ad From 973508d1c5e3dcae276c05f21b36e5e4980ece8d Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 31 Oct 2018 10:09:06 -0700 Subject: [PATCH 2/3] Updating submodule(s) EntityFrameworkCore => 02c9355b90096762400aa0ab9943725a4cfd8d43 Identity => da9318f4313064a019772757fd96d94b65d5a5d9 KestrelHttpServer => e958d8258445c2cda73c244d586f06ca6753be4e Mvc => c74a945dda2c96af30bb9dd1482a67edfe6fdd56 Razor => 41fa3ff3eb9aac033aaae942765e16885b112a3a SignalR => 865de160864d512628fecd2116ae49d6feeef7f1 [auto-updated: submodules] --- modules/EntityFrameworkCore | 2 +- modules/Identity | 2 +- modules/KestrelHttpServer | 2 +- modules/Mvc | 2 +- modules/Razor | 2 +- modules/SignalR | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 69e54addd4..02c9355b90 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 69e54addd48783e2219a239b2c03933b48e83071 +Subproject commit 02c9355b90096762400aa0ab9943725a4cfd8d43 diff --git a/modules/Identity b/modules/Identity index 9405d058fa..da9318f431 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 9405d058fada102a9e9573b5afa01a5a024e03cc +Subproject commit da9318f4313064a019772757fd96d94b65d5a5d9 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 395b681348..e958d82584 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 395b6813487e4c799a6fb6affd13717acb8dd8b6 +Subproject commit e958d8258445c2cda73c244d586f06ca6753be4e diff --git a/modules/Mvc b/modules/Mvc index 35d2ab37f7..c74a945dda 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 35d2ab37f733228af54e20d2cb2a056392e1adb4 +Subproject commit c74a945dda2c96af30bb9dd1482a67edfe6fdd56 diff --git a/modules/Razor b/modules/Razor index 8674dd9236..41fa3ff3eb 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 8674dd923636ea5667b3c4b3554b41ee4e442ec1 +Subproject commit 41fa3ff3eb9aac033aaae942765e16885b112a3a diff --git a/modules/SignalR b/modules/SignalR index 73f2f19984..865de16086 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 73f2f1998467e95c3dc6839268282d8b57c2d530 +Subproject commit 865de160864d512628fecd2116ae49d6feeef7f1 From 1f896dc61bb43c9caea9c86d94e8647558da4e23 Mon Sep 17 00:00:00 2001 From: Brice Lambson Date: Mon, 29 Oct 2018 19:11:44 -0700 Subject: [PATCH 3/3] :arrow_up: Update NetTopologySuite.IO.SqlServerBytes to 1.15.0 --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 3a50bcd957..90b1d52834 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -131,7 +131,7 @@ 2.0.3 1.15.1 1.15.0 - 1.15.0-pre001 + 1.15.0 1.0.1 11.0.2 4.7.0