From de8f69a3cd0e87c6f8a3514b2d9ca9b4c4aca925 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 19:55:25 +0000 Subject: [PATCH 1/4] Updating BuildTools from 2.1.0-preview1-1025 to 2.1.0-preview1-1027 [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 46abcdc657..8e2a1d99b5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.0-preview1-1025 -commithash:5111f89ef43885db3dcf81cefc84e2a1d6715b73 +version:2.1.0-preview1-1027 +commithash:f5c4b3e1c519c8aea832672f2f42531912f7b9fb From c32421689e38c4b1e4ef6f6063cff1375361d777 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 21:16:23 +0000 Subject: [PATCH 2/4] Updating submodule(s) DataProtection => a6165304b34db6a788df4d48cea0f649b0d41761 Razor => 02200d4c11907b094dc5441ac8461acf0e94e538 [auto-updated: submodules] --- modules/DataProtection | 2 +- modules/Razor | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/DataProtection b/modules/DataProtection index 2323298667..a6165304b3 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit 232329866788d50eb349ac3ce460f3bd292965ad +Subproject commit a6165304b34db6a788df4d48cea0f649b0d41761 diff --git a/modules/Razor b/modules/Razor index 1a77aecf68..02200d4c11 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 1a77aecf68ed709e0537dcf46f1e42a52899be16 +Subproject commit 02200d4c11907b094dc5441ac8461acf0e94e538 From fec15b82462c67b5196a64c61015bb7d49cb6a18 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 14 Feb 2018 14:11:16 -0800 Subject: [PATCH 3/4] Split dependency versions into pinned vs automatically updated/overridden (#879) --- build/dependencies.props | 174 +++++++++++++++--------------- build/external-dependencies.props | 5 - scripts/UpdateDependencies.ps1 | 2 +- 3 files changed, 91 insertions(+), 90 deletions(-) diff --git a/build/dependencies.props b/build/dependencies.props index 7331b6a27a..d8ad89cbef 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,52 +1,22 @@  - - 2.1.0-prerelease-02430-04 - 2.0.0 - 8.7.0 - 0.10.11 - 4.3.1 - 2.4.337 - 4.2.1 - 6.1.3 + + 4.2.1 1.0.5 - 3.1.0 - $(KoreBuildVersion) - $(KoreBuildVersion) - 1.10.0 - 2.1.1 - $(InternalAspNetCoreSdkPackageVersion) - 2.2.1 - 5.2.4-preview1 - 2.3.2 - 1.1.3 - 1.1.0-preview 15.7.0-preview-000010-1365343 15.7.0-preview-000010-1365343 15.7.0-preview-000010-1365343 15.7.0-preview-000010-1365343 15.7.0-preview-000010-1365343 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 - 2.6.1 4.5.0-preview1-26208-08 2.1.0-preview1-26208-06 1.0.0-rc3-003121 2.1.0-preview1-26208-06 1.1.0 - 3.14.2 - 5.2.0-preview2-41113220915 1.0.5 1.1.2 2.0.0 - + 2.1.0-preview1-26208-06 2.6.0-beta2-62211-02 2.1.0-preview1-26208-06 @@ -55,41 +25,9 @@ 2.1.0-preview1-26208-08 1.0.1 15.3.0 - 3.0.1 - 3.0.1 - 3.0.1 - 3.0.1 - 15.0.26606 - 15.6.161-preview - 15.6.161-preview - 15.6.161-preview - 2.6.1 - 7.10.6070 - 15.0.26606 - 10.0.30319 - 11.0.61030 - 12.0.30110 - 8.0.50727 - 9.0.30729 - 7.10.6071 - 15.6.161-preview - 15.6.161-preview - 15.6.161-preview - 15.6.161-preview - 7.0.0 - 1.4.0 4.5.0-preview1-26208-08 - 1.3.7 - 1.0.1 - 4.7.49 - 0.9.0-beta2 - 1.6.1 2.0.1 - 1.0.1 - 10.0.1 4.7.0-preview1-4939 - 12.2.1100 - 2.2.0-alpha-002 2.1.0-preview1-26208-06 2.1.0-preview1-26208-06 2.1.0-preview1-26208-06 @@ -115,14 +53,6 @@ 2.1.0-preview1-26208-06 2.1.0-preview1-26208-06 2.1.0-preview1-26208-06 - 1.4.0 - 3.2.0 - 1.1.8 - 1.1.8 - 1.1.8 - 1.2.4 - 1.1.92 - 1.0.0 4.5.0-preview1-26208-08 0.1.0-preview1-180208-1 4.5.0-preview1-26208-08 @@ -138,7 +68,6 @@ 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 - 3.1.1 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 0.1.0-preview1-180208-1 @@ -146,15 +75,12 @@ 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 - 6.1.7601.17515 4.5.0-preview1-26208-08 4.3.2 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 - 3.1.1 4.5.0-preview1-26208-08 - 4.3.0 1.6.0-preview1-26208-08 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 @@ -178,6 +104,93 @@ 4.9.0-preview1-26208-08 4.5.0-preview1-26208-08 4.5.0-preview1-26208-08 + + + + + + + $(MicrosoftNETCoreAppPackageVersion) + + + $(KoreBuildVersion) + $(KoreBuildVersion) + $(KoreBuildVersion) + + + + + 2.1.0-prerelease-02430-04 + 2.0.0 + 8.7.0 + 0.10.11 + 2.4.337 + 4.2.1 + 6.1.3 + 3.1.0 + 1.10.0 + 2.1.1 + 2.2.1 + 5.2.4-preview1 + 2.3.2 + 1.1.3 + 1.1.0-preview + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 2.6.1 + 3.14.2 + 5.2.0-preview2-41113220915 + 3.0.1 + 3.0.1 + 3.0.1 + 3.0.1 + 15.0.26606 + 15.6.161-preview + 15.6.161-preview + 15.6.161-preview + 2.6.1 + 7.10.6070 + 15.0.26606 + 10.0.30319 + 11.0.61030 + 12.0.30110 + 8.0.50727 + 9.0.30729 + 7.10.6071 + 15.6.161-preview + 15.6.161-preview + 15.6.161-preview + 15.6.161-preview + 7.0.0 + 1.4.0 + 1.3.7 + 1.0.1 + 4.7.49 + 0.9.0-beta2 + 1.6.1 + 1.0.1 + 10.0.1 + 12.2.1100 + 2.2.0-alpha-002 + 1.4.0 + 3.2.0 + 1.1.8 + 1.1.8 + 1.1.8 + 1.2.4 + 1.1.92 + 1.0.0 + 3.1.1 + 6.1.7601.17515 + 3.1.1 + 4.3.0 9.0.1 2.7.0-beta3-62512-06 2.7.0-beta3-62512-06 @@ -202,11 +215,4 @@ 2.3.1 2.3.1 - - - - - - $(MicrosoftNETCoreAppPackageVersion) - diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 027d382edb..10f5c65cd4 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -341,11 +341,6 @@ - - - KRB2004 - Benchmarks_11_SystemDataSqlClientPackageVersion - diff --git a/scripts/UpdateDependencies.ps1 b/scripts/UpdateDependencies.ps1 index 92b9737a6f..02f799614a 100644 --- a/scripts/UpdateDependencies.ps1 +++ b/scripts/UpdateDependencies.ps1 @@ -51,7 +51,7 @@ foreach ($varName in ($variables.Keys | sort)) { $packageVersion = $packageVersions | Select-Object -First 1 - $depVarNode = $dependencies.SelectSingleNode("//PropertyGroup/$varName") + $depVarNode = $dependencies.SelectSingleNode("//PropertyGroup[`@Label=`"Package Versions: Auto`"]/$varName") if ($depVarNode -and $depVarNode.InnerText -ne $packageVersion) { $depVarNode.InnerText = $packageVersion $count++ From 1e7452c23d3351968eb72ee7b2b99fd6a3f66eb7 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Wed, 14 Feb 2018 14:44:17 -0800 Subject: [PATCH 4/4] Updating submodule(s) MvcPrecompilation => 176d27af5e92320e29c80fb4b6554dbde1ce750e [auto-updated: submodules] --- modules/MvcPrecompilation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index a40b40bc42..176d27af5e 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit a40b40bc4271b45a29800cc6f0b8d8378384369c +Subproject commit 176d27af5e92320e29c80fb4b6554dbde1ce750e