From 9954f5a703634cec536a8908c6326a39f526cc73 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Mon, 19 Nov 2018 11:16:03 -0800 Subject: [PATCH 1/3] Fix MSB4062 - fix conflicting build tools dependencies by ensuring the same version is used --- build/repo.props | 2 +- src/SiteExtensions/Directory.Build.props | 5 +++++ src/SiteExtensions/build/dependencies.props | 7 ++----- src/SiteExtensions/build/repo.props | 9 ++++----- src/SiteExtensions/global.json | 4 ++-- .../Microsoft.Web.Xdt.Extensions.csproj | 5 ++--- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/build/repo.props b/build/repo.props index a9d3fdec06..c2abd8c8c7 100644 --- a/build/repo.props +++ b/build/repo.props @@ -50,7 +50,7 @@ - + diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props index b6e2f87d64..4710620462 100644 --- a/src/SiteExtensions/Directory.Build.props +++ b/src/SiteExtensions/Directory.Build.props @@ -5,4 +5,9 @@ + + false + false + + diff --git a/src/SiteExtensions/build/dependencies.props b/src/SiteExtensions/build/dependencies.props index f17068b5eb..ef1eb218ff 100644 --- a/src/SiteExtensions/build/dependencies.props +++ b/src/SiteExtensions/build/dependencies.props @@ -3,14 +3,11 @@ $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + - 3.0.0-build-20181114.5 2.1.1-rtm-31076 2.2.0-rtm-35515 - 15.6.1 - 1.4.0 - 2.4.0 - 2.4.0 diff --git a/src/SiteExtensions/build/repo.props b/src/SiteExtensions/build/repo.props index 25129c9001..4fcd933beb 100644 --- a/src/SiteExtensions/build/repo.props +++ b/src/SiteExtensions/build/repo.props @@ -1,8 +1,7 @@ - - - - - + + + true + diff --git a/src/SiteExtensions/global.json b/src/SiteExtensions/global.json index bf91e8bc39..6df6220662 100644 --- a/src/SiteExtensions/global.json +++ b/src/SiteExtensions/global.json @@ -1,8 +1,8 @@ { "sdk": { - "version": "2.2.100-preview3-009430" + "version": "3.0.100-preview-009750" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-alpha1-20181018.6" + "Internal.AspNetCore.Sdk": "3.0.0-build-20181114.5" } } diff --git a/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj b/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj index 4222ec4e2d..170d75c0bd 100644 --- a/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj +++ b/src/SiteExtensions/src/Microsoft.Web.Xdt.Extensions/Microsoft.Web.Xdt.Extensions.csproj @@ -3,12 +3,11 @@ Additional functionality for Xdt transforms. net461 - true - xdt + false - \ No newline at end of file + From db42dd7faa3f89bd4cc73412f84d9c65dbfa2cbf Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 19 Nov 2018 11:56:01 -0800 Subject: [PATCH 2/3] Updating submodule(s) AADIntegration => 3c282a4f5af2601166d976261d8b862994694c81 AuthSamples => 8f471bf65bbc6a5de4425da64a64ee262aafbadb CORS => c39d85f6df58ecb4507fd3d2a2d9f8d36054922b Diagnostics => 082d505977d72c75b68935c93c21feded6928e5f Hosting => f6cda4fab73ff5d4594741cc5b34b58fa3d0e579 HttpAbstractions => 962ec07bdbb090ac2e9cd2a0e68e24c6c276a972 HttpClientFactory => 7c4f9479b4753a37c8b0669a883002e5e448cc94 Identity => 68b878f0e135f28260950fa485dcd53eae1da3a9 JavaScriptServices => e657e7d79aa11ced73a0a2e0f4d3fbbb609ca507 Localization => 60a3d57a3e8b8b6d69232815a9596b5a495a7d0b MetaPackages => 501dd3924b8e738adfb525876c7af5a477314626 MusicStore => aca4b432e157c5e9063f551af8bff3de7641b744 Mvc => 2414db256f32a047770326d14d8b0e2afd49ba49 Razor => 6c8e900d11c0ed2d2b459a3c24fe84414ca9d35e Routing => aed55d4517ac86a639724b9d1a10cbd04b92f503 Security => e0538784647990905f9c5fdc5bc2f0e5c7388909 ServerTests => 619d3585854ac311986c44715012d10e45a932a6 Session => abbdfb72ef54a77623c01d517c85eb8b28c70bc0 SignalR => 2c3ebd1648a480ca180c77f123a10f4dcc591c3b Templating => 514fcdcba533eb70a670b9ccc2073d67f6c6f9ca [auto-updated: submodules] --- modules/AADIntegration | 2 +- modules/AuthSamples | 2 +- modules/CORS | 2 +- modules/Diagnostics | 2 +- modules/Hosting | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/Localization | 2 +- modules/MetaPackages | 2 +- modules/MusicStore | 2 +- modules/Mvc | 2 +- modules/Razor | 2 +- modules/Routing | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/Templating | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/modules/AADIntegration b/modules/AADIntegration index 1e26b6673d..3c282a4f5a 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit 1e26b6673d317df42db6b3a56af687ed5451c333 +Subproject commit 3c282a4f5af2601166d976261d8b862994694c81 diff --git a/modules/AuthSamples b/modules/AuthSamples index 906f316d2b..8f471bf65b 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit 906f316d2bef72ae9142dff54e41e7970a623822 +Subproject commit 8f471bf65bbc6a5de4425da64a64ee262aafbadb diff --git a/modules/CORS b/modules/CORS index e790a9bb10..c39d85f6df 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit e790a9bb10a61bd538964c44bf2f1fa984e9559c +Subproject commit c39d85f6df58ecb4507fd3d2a2d9f8d36054922b diff --git a/modules/Diagnostics b/modules/Diagnostics index cfdbbdec15..082d505977 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit cfdbbdec15c2ae464e559f14c8110bf7b7522e8f +Subproject commit 082d505977d72c75b68935c93c21feded6928e5f diff --git a/modules/Hosting b/modules/Hosting index cfe9b26a34..f6cda4fab7 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit cfe9b26a34af15c4943240d790ee5d1a168290c9 +Subproject commit f6cda4fab73ff5d4594741cc5b34b58fa3d0e579 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 49d785c934..962ec07bdb 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 49d785c9343d64b93fadfb7eea36c358825cccb0 +Subproject commit 962ec07bdbb090ac2e9cd2a0e68e24c6c276a972 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index 4dfcf7485e..7c4f9479b4 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit 4dfcf7485e62819d0d73c00d7e7eb53d75abdbd3 +Subproject commit 7c4f9479b4753a37c8b0669a883002e5e448cc94 diff --git a/modules/Identity b/modules/Identity index 073b0377e8..68b878f0e1 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 073b0377e8d40720009235f62466ce799f20a646 +Subproject commit 68b878f0e135f28260950fa485dcd53eae1da3a9 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 160d822f52..e657e7d79a 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 160d822f525f3f14cd55ff53bd9dac503947cf79 +Subproject commit e657e7d79aa11ced73a0a2e0f4d3fbbb609ca507 diff --git a/modules/Localization b/modules/Localization index b8747c8b6b..60a3d57a3e 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit b8747c8b6b6e9e0e015f2a9dffa81a0247ab8125 +Subproject commit 60a3d57a3e8b8b6d69232815a9596b5a495a7d0b diff --git a/modules/MetaPackages b/modules/MetaPackages index 62d9794c63..501dd3924b 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 62d9794c633a9a2c502334d525d81c454ac29264 +Subproject commit 501dd3924b8e738adfb525876c7af5a477314626 diff --git a/modules/MusicStore b/modules/MusicStore index 2b0ea782be..aca4b432e1 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit 2b0ea782be84655f9d6320b591efcb6dc1a38177 +Subproject commit aca4b432e157c5e9063f551af8bff3de7641b744 diff --git a/modules/Mvc b/modules/Mvc index 7c68233125..2414db256f 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 7c6823312540c72a0579f4a4b2e8357b1df42de8 +Subproject commit 2414db256f32a047770326d14d8b0e2afd49ba49 diff --git a/modules/Razor b/modules/Razor index b2e9365084..6c8e900d11 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit b2e93650842cbf3e00598ede40a67a432eaf6c25 +Subproject commit 6c8e900d11c0ed2d2b459a3c24fe84414ca9d35e diff --git a/modules/Routing b/modules/Routing index b6a1de5676..aed55d4517 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit b6a1de56769f4c6e446ae65c4a75c699393eba46 +Subproject commit aed55d4517ac86a639724b9d1a10cbd04b92f503 diff --git a/modules/Security b/modules/Security index 7e14b052ea..e053878464 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit 7e14b052ea9cb935ec4f5cb0485b4edb5d41297a +Subproject commit e0538784647990905f9c5fdc5bc2f0e5c7388909 diff --git a/modules/ServerTests b/modules/ServerTests index 880dd2b706..619d358585 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 880dd2b70697f1d6298f9cfde3c090a8635995d0 +Subproject commit 619d3585854ac311986c44715012d10e45a932a6 diff --git a/modules/Session b/modules/Session index a4af62e774..abbdfb72ef 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit a4af62e77446c0edd44f5711666ce9687e0ca17e +Subproject commit abbdfb72ef54a77623c01d517c85eb8b28c70bc0 diff --git a/modules/SignalR b/modules/SignalR index 05b0d41533..2c3ebd1648 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 05b0d41533f921ec9d2027ac651f2f6581cb037c +Subproject commit 2c3ebd1648a480ca180c77f123a10f4dcc591c3b diff --git a/modules/Templating b/modules/Templating index 0af2acd6ff..514fcdcba5 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 0af2acd6fff0f51ec42183f5a5b01f8f0712af5f +Subproject commit 514fcdcba533eb70a670b9ccc2073d67f6c6f9ca From 0b8fe9ded9e353948c28ce2bdf357e0df0372574 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Mon, 19 Nov 2018 11:56:13 -0800 Subject: [PATCH 3/3] Updating BuildTools from 3.0.0-build-20181114.5 to 3.0.0-build-20181116.1 [auto-updated: buildtools] --- global.json | 2 +- korebuild-lock.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/global.json b/global.json index 6df6220662..a1322767f3 100644 --- a/global.json +++ b/global.json @@ -3,6 +3,6 @@ "version": "3.0.100-preview-009750" }, "msbuild-sdks": { - "Internal.AspNetCore.Sdk": "3.0.0-build-20181114.5" + "Internal.AspNetCore.Sdk": "3.0.0-build-20181116.1" } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 73613543d0..7c88df468b 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:3.0.0-build-20181114.5 -commithash:880e9a204d4ee4a18dfd83c9fb05a192a28bca60 +version:3.0.0-build-20181116.1 +commithash:9be7d79a8f7e0668f66e584aca1e962f45975511