From 5884ed561bbff019e65bc2dd30cc3b404ae662b0 Mon Sep 17 00:00:00 2001 From: "ASP.NET CI" Date: Tue, 12 Jun 2018 19:51:22 +0000 Subject: [PATCH 1/9] Updating submodule(s) AADIntegration => 111b8d812dcae225bc20e115680dbf2b62da1ed9 Antiforgery => 443fe51456f5b36166e0e34f44044392e99a1217 AuthSamples => 99e5f7ec0fae94f9f12ba473f8447e2fabb0506d AzureIntegration => 41c0cfb1a8c93547b2fd8736208227a3d8c6c4c1 BasicMiddleware => 8c7e7357d40663abd8c82f7e24963d0c857cf117 BrowserLink => 3a52b689fb752811cdd1ad90695f35289e03d4d8 Caching => cd592226aea44b0e6be413f636cfa552863c7a95 Common => 3225f2a78ee19507372b0b1ada2f8739e667bf09 Configuration => 4fb6f1211155833e8b72a789c23db55893d8a0b7 CORS => ccd4d50d6fb9d17466d582f31f7a8618914b9a68 DataProtection => b40fa1bdfbaefd48064504d5cb993b6e36daf943 DependencyInjection => 960aa7c28783c26b42554cfe406e2d9d8986e98f Diagnostics => dedefd7043d8cdf2d38487aa2415084597ec25e1 DotNetTools => ee20ecf20e4ac1f2aaffac591580d2fdc6d6f6de EntityFrameworkCore => d6071c9e4c3d9fb2d1e7943aad7b77b2361ddf62 EventNotification => 7981758af4141ef81f6388a92c988869aa105993 FileSystem => 36f88e9b39b9c88a302110970c7761996f15ca3e Hosting => 72c28fa87555d60925e6bbab2d2e9dd8da752492 HtmlAbstractions => 256f7755bae10204ba6c3b669d2289b7de33308a HttpAbstractions => f47b5e9f9e29c16f002c86de6d908bafd4cd9783 HttpClientFactory => 39885c573a70beba534001e4639ff05358fd94aa HttpSysServer => 2e4a9f8987389fd9342d952316a5d51cc6962f8b Identity => 64a88252ce62f83fdb78762a62af0a2c06aff1a9 IISIntegration => 278a4794a8091da5c72c8900fe6dc1cfda58e301 JavaScriptServices => d65a4f3b6dff8b6508a9db2b91db495bcb0a6af9 JsonPatch => 1780662ac507c9b21bf7054bc1f68ccd07ed93ff KestrelHttpServer => ab5fb559e54244d0fa36b86ff18a0363530f4a46 Localization => ebe067fa0faa6db33f56fa08fa34921477993379 Logging => 7b9db0d874046496ee76547558808151e9a267d5 MetaPackages => d5cd1cf82110eea62b625783247b5289059a61fa Microsoft.Data.Sqlite => 3f42b6de5709b6cafb7b0d6a82d843eae2c781e1 MusicStore => 450aa97f861d81d1e8b020d087aafbb381e8a3b6 Mvc => 9d3243c38d1ecd6bb004d040aefb567b3bedd332 MvcPrecompilation => c6b52cf95a9c2b35d6acd380d85613354249f2fd Options => bee9916eebb1071eb57efbe2674a95d774e90337 Razor => 67bbd067d53e230c7159c04a7a58e56f5202d083 ResponseCaching => 9e7c650c8a22158fc1099fa1f028bca93166fc8a Routing => 12912ae6eb34c780e85b0a44a9b6e40e0520ad67 Scaffolding => 7a7f6e0d05f8a2432b6489c760abdfbf1ca0af7a Security => ac1a9ef6d183a94646a4b5e57b7be1c6e53b5605 ServerTests => e4da0155910aad63360d47822d6b8affd4a2f61b Session => 2d910089bc05f4ef35bb5807b648ebf557c7a408 SignalR => c7fc179b2700bd08acd13432811bdcb6f8780ced StaticFiles => 8109246248cfff0a67d1a9774bff443c8b6e7f23 Templating => 7fd9959fb4079c1250c16ae0315b7f37f4e88dd8 Testing => 1eedb2ce3ff4ab8d010dd7e16b53a9c8795f9d4e WebSockets => 76e31009e3f13c8deddd6c1829e05726924185cb [auto-updated: submodules] --- modules/AADIntegration | 2 +- modules/Antiforgery | 2 +- modules/AuthSamples | 2 +- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/BrowserLink | 2 +- modules/CORS | 2 +- modules/Caching | 2 +- modules/Common | 2 +- modules/Configuration | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/Diagnostics | 2 +- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/EventNotification | 2 +- modules/FileSystem | 2 +- modules/Hosting | 2 +- modules/HtmlAbstractions | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Localization | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Microsoft.Data.Sqlite | 2 +- modules/MusicStore | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Options | 2 +- modules/Razor | 2 +- modules/ResponseCaching | 2 +- modules/Routing | 2 +- modules/Scaffolding | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- modules/Testing | 2 +- modules/WebSockets | 2 +- 47 files changed, 47 insertions(+), 47 deletions(-) diff --git a/modules/AADIntegration b/modules/AADIntegration index a35250fe3a..111b8d812d 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit a35250fe3ad8125a4c6fd67feb4055e9470fe558 +Subproject commit 111b8d812dcae225bc20e115680dbf2b62da1ed9 diff --git a/modules/Antiforgery b/modules/Antiforgery index 24cf5b1cc8..443fe51456 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 24cf5b1cc86e2c395f7622c1a9a91b209e5ff82b +Subproject commit 443fe51456f5b36166e0e34f44044392e99a1217 diff --git a/modules/AuthSamples b/modules/AuthSamples index 03b4a625c3..99e5f7ec0f 160000 --- a/modules/AuthSamples +++ b/modules/AuthSamples @@ -1 +1 @@ -Subproject commit 03b4a625c3c007f75ef2650c84401e8deb72870f +Subproject commit 99e5f7ec0fae94f9f12ba473f8447e2fabb0506d diff --git a/modules/AzureIntegration b/modules/AzureIntegration index c710aa8c26..41c0cfb1a8 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit c710aa8c2663e474c270ec48dd9dc999d38d9a46 +Subproject commit 41c0cfb1a8c93547b2fd8736208227a3d8c6c4c1 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 999ed531cb..8c7e7357d4 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 999ed531cb25cc4f2c31f84c7144b9e401943aa9 +Subproject commit 8c7e7357d40663abd8c82f7e24963d0c857cf117 diff --git a/modules/BrowserLink b/modules/BrowserLink index ba0dfea555..3a52b689fb 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit ba0dfea5556dbd73d7f239845ac9da129bce2d35 +Subproject commit 3a52b689fb752811cdd1ad90695f35289e03d4d8 diff --git a/modules/CORS b/modules/CORS index 5fd4b0af55..ccd4d50d6f 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 5fd4b0af55f5d486e2c40a5801f106662d797392 +Subproject commit ccd4d50d6fb9d17466d582f31f7a8618914b9a68 diff --git a/modules/Caching b/modules/Caching index b6a7abd721..cd592226ae 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit b6a7abd721b6a3ad0386cbf36b88420ddacd700c +Subproject commit cd592226aea44b0e6be413f636cfa552863c7a95 diff --git a/modules/Common b/modules/Common index dcc0f3ba2a..3225f2a78e 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit dcc0f3ba2aef1cd6b0c6403171af7c91e6094382 +Subproject commit 3225f2a78ee19507372b0b1ada2f8739e667bf09 diff --git a/modules/Configuration b/modules/Configuration index 2679cfd946..4fb6f12111 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit 2679cfd94694a29230726708717ab9c4579a5d80 +Subproject commit 4fb6f1211155833e8b72a789c23db55893d8a0b7 diff --git a/modules/DataProtection b/modules/DataProtection index a3667dab27..b40fa1bdfb 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit a3667dab27535efe9815022305fc3f817e4a7780 +Subproject commit b40fa1bdfbaefd48064504d5cb993b6e36daf943 diff --git a/modules/DependencyInjection b/modules/DependencyInjection index 930037a4f8..960aa7c287 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit 930037a4f8b74a9c1e30d881507a05bea0a7c2e0 +Subproject commit 960aa7c28783c26b42554cfe406e2d9d8986e98f diff --git a/modules/Diagnostics b/modules/Diagnostics index 977f85f9cc..dedefd7043 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit 977f85f9cc9ca2685389a740bface9e18fcf5bdd +Subproject commit dedefd7043d8cdf2d38487aa2415084597ec25e1 diff --git a/modules/DotNetTools b/modules/DotNetTools index 0ce4004cde..ee20ecf20e 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 0ce4004cde8798b377608f14bc54bafcb0dc52af +Subproject commit ee20ecf20e4ac1f2aaffac591580d2fdc6d6f6de diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index f3a183efd5..d6071c9e4c 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit f3a183efd51c9dda512b8af9a4274b36b7c1450c +Subproject commit d6071c9e4c3d9fb2d1e7943aad7b77b2361ddf62 diff --git a/modules/EventNotification b/modules/EventNotification index 5a7de63da1..7981758af4 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit 5a7de63da188d45782d4b1d500bdf33748a7a7fb +Subproject commit 7981758af4141ef81f6388a92c988869aa105993 diff --git a/modules/FileSystem b/modules/FileSystem index 7923b2c69f..36f88e9b39 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 7923b2c69fbf51e160f46d48f80f14e6742e0ab4 +Subproject commit 36f88e9b39b9c88a302110970c7761996f15ca3e diff --git a/modules/Hosting b/modules/Hosting index 1596c2ba55..72c28fa875 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 1596c2ba5508fceefd929228b4e5e95e50b1d4d4 +Subproject commit 72c28fa87555d60925e6bbab2d2e9dd8da752492 diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index 4764c44e93..256f7755ba 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit 4764c44e93d0bb772def90285d16572bc2bc376c +Subproject commit 256f7755bae10204ba6c3b669d2289b7de33308a diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index b8be770d37..f47b5e9f9e 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit b8be770d371134f8f6618212569ed69c341daffe +Subproject commit f47b5e9f9e29c16f002c86de6d908bafd4cd9783 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index ad4c84b743..39885c573a 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit ad4c84b74397a776efd93405188a6d738f7ab3bc +Subproject commit 39885c573a70beba534001e4639ff05358fd94aa diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 5bc05b26de..2e4a9f8987 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 5bc05b26de50fb93a9f79180ee9a039f4bc50b9f +Subproject commit 2e4a9f8987389fd9342d952316a5d51cc6962f8b diff --git a/modules/IISIntegration b/modules/IISIntegration index 27750d669e..278a4794a8 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 27750d669e1cf686d5b1a0753bac3e3b600e777e +Subproject commit 278a4794a8091da5c72c8900fe6dc1cfda58e301 diff --git a/modules/Identity b/modules/Identity index d18de6b00e..64a88252ce 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit d18de6b00e13f06bae43c621f17e39ed2bec4069 +Subproject commit 64a88252ce62f83fdb78762a62af0a2c06aff1a9 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 436cdb0e96..d65a4f3b6d 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 436cdb0e967ab5b3e3903bb876bbd3edef844172 +Subproject commit d65a4f3b6dff8b6508a9db2b91db495bcb0a6af9 diff --git a/modules/JsonPatch b/modules/JsonPatch index d89db5fcd7..1780662ac5 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit d89db5fcd7302d08a94a995f280fb30f715b0b16 +Subproject commit 1780662ac507c9b21bf7054bc1f68ccd07ed93ff diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index e4d290b601..ab5fb559e5 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit e4d290b601ef646c5e02b5819012b49ad54f5a4e +Subproject commit ab5fb559e54244d0fa36b86ff18a0363530f4a46 diff --git a/modules/Localization b/modules/Localization index 02beb0ab58..ebe067fa0f 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit 02beb0ab58b50fdd7da09bacdc1a5f41317e6cb9 +Subproject commit ebe067fa0faa6db33f56fa08fa34921477993379 diff --git a/modules/Logging b/modules/Logging index a0398f0baf..7b9db0d874 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit a0398f0baf9ecc8e5fb6afc3a9b89f0d49cf041e +Subproject commit 7b9db0d874046496ee76547558808151e9a267d5 diff --git a/modules/MetaPackages b/modules/MetaPackages index 10e735d420..d5cd1cf821 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 10e735d42002db959e1a769a3362c84ec0ef1c27 +Subproject commit d5cd1cf82110eea62b625783247b5289059a61fa diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index e6d79ed5de..3f42b6de57 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit e6d79ed5dec48e4788e0897ef23b8f1e35de6d4a +Subproject commit 3f42b6de5709b6cafb7b0d6a82d843eae2c781e1 diff --git a/modules/MusicStore b/modules/MusicStore index 51406d3672..450aa97f86 160000 --- a/modules/MusicStore +++ b/modules/MusicStore @@ -1 +1 @@ -Subproject commit 51406d3672d73c2c1cb75c750077e8f45b0c4dc9 +Subproject commit 450aa97f861d81d1e8b020d087aafbb381e8a3b6 diff --git a/modules/Mvc b/modules/Mvc index 2d63669695..9d3243c38d 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 2d63669695379d7da9c92653c24c8c626df02dad +Subproject commit 9d3243c38d1ecd6bb004d040aefb567b3bedd332 diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 0f12047271..c6b52cf95a 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 0f12047271e3abca61617cfda3daaeff0e950449 +Subproject commit c6b52cf95a9c2b35d6acd380d85613354249f2fd diff --git a/modules/Options b/modules/Options index 686e26b3a2..bee9916eeb 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit 686e26b3a2999c841d736b689b0a1a768fdecbf8 +Subproject commit bee9916eebb1071eb57efbe2674a95d774e90337 diff --git a/modules/Razor b/modules/Razor index cdbcfb7a05..67bbd067d5 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit cdbcfb7a05db42f33c27aff0dcffa76735db13e7 +Subproject commit 67bbd067d53e230c7159c04a7a58e56f5202d083 diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 4b707e2fe8..9e7c650c8a 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 4b707e2fe801048946b5fdf5bc63638b891fc556 +Subproject commit 9e7c650c8a22158fc1099fa1f028bca93166fc8a diff --git a/modules/Routing b/modules/Routing index 37c499e1e1..12912ae6eb 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 37c499e1e151f3922e8b98515daa220c9f707e57 +Subproject commit 12912ae6eb34c780e85b0a44a9b6e40e0520ad67 diff --git a/modules/Scaffolding b/modules/Scaffolding index fcf4d2eee3..7a7f6e0d05 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit fcf4d2eee310d9ef3067fa274e45952d7bb91c71 +Subproject commit 7a7f6e0d05f8a2432b6489c760abdfbf1ca0af7a diff --git a/modules/Security b/modules/Security index e538375c44..ac1a9ef6d1 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit e538375c443a11d96370eb767fce7bb559e00dc9 +Subproject commit ac1a9ef6d183a94646a4b5e57b7be1c6e53b5605 diff --git a/modules/ServerTests b/modules/ServerTests index ad246441c5..e4da015591 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit ad246441c5209274f675df0c1befb3274b8c0b92 +Subproject commit e4da0155910aad63360d47822d6b8affd4a2f61b diff --git a/modules/Session b/modules/Session index d0815aefe1..2d910089bc 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit d0815aefe1aa667150983db83a22059b54ae484f +Subproject commit 2d910089bc05f4ef35bb5807b648ebf557c7a408 diff --git a/modules/SignalR b/modules/SignalR index 5d37d312e0..c7fc179b27 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 5d37d312e043c73a5f6d1db2c1e57a1c1280fb46 +Subproject commit c7fc179b2700bd08acd13432811bdcb6f8780ced diff --git a/modules/StaticFiles b/modules/StaticFiles index 5c775c9579..8109246248 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 5c775c957991cb9e5d20c9cf3c67d56dc92d80ba +Subproject commit 8109246248cfff0a67d1a9774bff443c8b6e7f23 diff --git a/modules/Templating b/modules/Templating index a5bb91c2cb..7fd9959fb4 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit a5bb91c2cb25ef3411ae7e80608ae463e4b320c4 +Subproject commit 7fd9959fb4079c1250c16ae0315b7f37f4e88dd8 diff --git a/modules/Testing b/modules/Testing index d7056f3aae..1eedb2ce3f 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit d7056f3aaeeaef3e10ece062d04eefdcd9f97719 +Subproject commit 1eedb2ce3ff4ab8d010dd7e16b53a9c8795f9d4e diff --git a/modules/WebSockets b/modules/WebSockets index a1085ed31c..76e31009e3 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit a1085ed31cebed4d4fa1f10cd662a462a87d41f1 +Subproject commit 76e31009e3f13c8deddd6c1829e05726924185cb From e4e3551a1ed44fac3e2323c6ee16543dd36c6cbf Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Tue, 12 Jun 2018 15:18:36 -0700 Subject: [PATCH 2/9] Prepare 2.1.2 patch --- build/artifacts.props | 216 +---------------------------- build/dependencies.props | 16 +-- build/external-dependencies.props | 221 +++++++++++++++++++++++++++++- build/repo.targets | 12 +- build/sources.props | 3 - build/submodules.props | 78 +++++------ modules/Identity | 2 +- modules/KestrelHttpServer | 2 +- modules/MetaPackages | 2 +- modules/SignalR | 2 +- scripts/PatchVersionPrefix.ps1 | 2 +- version.props | 4 +- 12 files changed, 281 insertions(+), 279 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index 583384852a..dae497a65d 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -20,79 +20,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -105,57 +42,12 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -164,119 +56,13 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/build/dependencies.props b/build/dependencies.props index bf163efb53..222a21dbed 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -1,14 +1,9 @@ - + - 2.1.0 - 2.1.0 - 4.5.0 - 4.5.0 - 4.5.0 - 4.5.0 - 4.5.0 + 2.1.1 + 2.1.1 @@ -106,17 +101,21 @@ 4.5.0 1.5.0 4.5.0 + 4.5.1 4.5.0 4.5.0 5.2.0 3.1.1 4.5.0 + 4.5.1 4.3.2 4.5.0 + 4.5.1 4.5.0 3.1.1 4.3.0 1.6.0 + 4.5.1 4.3.0 4.5.0 4.5.0 @@ -126,6 +125,7 @@ 4.5.0 4.5.0 4.9.0 + 4.5.1 4.5.0 1.3.7 9.0.1 diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 4fe479655a..7a491d2990 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -1,4 +1,4 @@ - + @@ -160,6 +160,225 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/repo.targets b/build/repo.targets index 85bb04244f..21e585ec5d 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -180,6 +180,12 @@ DependsOnTargets="_PrepareRepositories;GeneratePropsFiles;ComputeGraph;_BuildRepositories" /> + + <_UndeclaredPackageArtifact Include="%(ArtifactInfo.PackageId)" Condition="'%(ArtifactInfo.ArtifactType)' == 'NuGetPackage'" /> <_UndeclaredPackageArtifact Remove="@(PackageArtifact)" /> @@ -188,12 +194,6 @@ - - - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/assets/ - $(DotNetAdditionalRestoreSources); $(DotNetRestoreSources); @@ -12,7 +10,6 @@ $(RestoreSources); https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json; - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json; https://api.nuget.org/v3/index.json; diff --git a/build/submodules.props b/build/submodules.props index 3ed74a06e6..0b97a955a8 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -6,54 +6,54 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/modules/Identity b/modules/Identity index 64a88252ce..788e324115 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 64a88252ce62f83fdb78762a62af0a2c06aff1a9 +Subproject commit 788e324115196d9fb1e15693266943a607644f87 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index ab5fb559e5..11ddd9174c 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit ab5fb559e54244d0fa36b86ff18a0363530f4a46 +Subproject commit 11ddd9174c7c2af231ad70cf3efad85012e2fd73 diff --git a/modules/MetaPackages b/modules/MetaPackages index d5cd1cf821..337c3a3a70 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit d5cd1cf82110eea62b625783247b5289059a61fa +Subproject commit 337c3a3a7013709e07fa47c7bc5b5745092c5389 diff --git a/modules/SignalR b/modules/SignalR index c7fc179b27..559d93c15e 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit c7fc179b2700bd08acd13432811bdcb6f8780ced +Subproject commit 559d93c15e10c2025ec9406612c0eaabb1fd7e2b diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 index 367c00d7fa..7ca81a78c5 100755 --- a/scripts/PatchVersionPrefix.ps1 +++ b/scripts/PatchVersionPrefix.ps1 @@ -1,4 +1,4 @@ -#!/usr/bin/env pwsh +#!/usr/bin/env pwsh -c <# .SYNOPSIS diff --git a/version.props b/version.props index a6263b44b2..81ac3b82ce 100644 --- a/version.props +++ b/version.props @@ -2,14 +2,14 @@ 2 1 - 1 + 2 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) rtm $(VersionPrefix) - 0.1.1 + 0.1.2 rtm $(PrereleaseVersionLabel) From e2e13eb718942d6a33e019bdcf76ac324deb3516 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 13 Jun 2018 15:50:07 -0700 Subject: [PATCH 3/9] Update templating submodule --- modules/Templating | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/Templating b/modules/Templating index 7fd9959fb4..4ff022bd70 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 7fd9959fb4079c1250c16ae0315b7f37f4e88dd8 +Subproject commit 4ff022bd7010a7b517d265ef3e121e4995f324f4 From ccfd5f80b75da884ad730b77fb3cc3445e22f129 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 18 Jun 2018 20:11:20 -0700 Subject: [PATCH 4/9] Pin runtime version for LZMA generation --- build/PackageArchive.targets | 2 +- build/dependencies.props | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index c2b5023391..5f092b2c78 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -46,7 +46,7 @@ + Properties="RestorePackagesPath=$(FallbackStagingDir);RuntimeFrameworkVersion=$(LZMAMicrosoftNETCoreApp21PackageVersion);DotNetRestoreSourcePropsPath=$(GeneratedFallbackRestoreSourcesPropsPath);DotNetBuildOffline=true;AspNetUniverseBuildOffline=true" /> diff --git a/build/dependencies.props b/build/dependencies.props index 222a21dbed..64ede2dfb6 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -28,6 +28,7 @@ 4.2.1 3.1.0 1.10.0 + 2.1.0 1.7.3.4 2.1.1 2.2.1 From ea5ed2250d6fca6e477ef7b23819aad5d86dbde1 Mon Sep 17 00:00:00 2001 From: John Luo Date: Wed, 20 Jun 2018 18:02:07 -0700 Subject: [PATCH 5/9] Pin aspnetcore runtime version for LZMA generation --- build/PackageArchive.targets | 2 +- build/dependencies.props | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/PackageArchive.targets b/build/PackageArchive.targets index 5f092b2c78..2d283d2e01 100644 --- a/build/PackageArchive.targets +++ b/build/PackageArchive.targets @@ -27,7 +27,7 @@ BuildArtifacts="@(ArtifactInfo)" PackageArtifacts="@(PackageArtifact)" ExternalDependencies="@(ExternalDependency)" - MetapackageVersion="$(PackageVersion)" /> + MetapackageVersion="$(LZMAMicrosoftAspNetCoreAppAll21PackageVersion)" /> <_FallbackArchiveRestoreSources Include="$(RestoreSources)" /> diff --git a/build/dependencies.props b/build/dependencies.props index 64ede2dfb6..e86f1495f9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -29,6 +29,7 @@ 3.1.0 1.10.0 2.1.0 + 2.1.1 1.7.3.4 2.1.1 2.2.1 From 6b8aac13e08dfdd4e01df6f1d01cc1f987bacab5 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 27 Jun 2018 14:51:05 -0700 Subject: [PATCH 6/9] Prepare infrastructure for the 2.1.3 patch --- build/artifacts.props | 215 +++++++++++++++++ build/external-dependencies.props | 217 ------------------ build/repo.targets | 8 +- build/submodules.props | 79 +++---- .../tools/NuspecBaselineGenerator/Program.cs | 19 +- korebuild-lock.txt | 4 +- modules/AADIntegration | 2 +- modules/Antiforgery | 2 +- modules/AzureIntegration | 2 +- modules/BasicMiddleware | 2 +- modules/BrowserLink | 2 +- modules/CORS | 2 +- modules/Caching | 2 +- modules/Common | 2 +- modules/Configuration | 2 +- modules/DataProtection | 2 +- modules/DependencyInjection | 2 +- modules/Diagnostics | 2 +- modules/DotNetTools | 2 +- modules/EntityFrameworkCore | 2 +- modules/FileSystem | 2 +- modules/Hosting | 2 +- modules/HtmlAbstractions | 2 +- modules/HttpAbstractions | 2 +- modules/HttpClientFactory | 2 +- modules/HttpSysServer | 2 +- modules/IISIntegration | 2 +- modules/Identity | 2 +- modules/JavaScriptServices | 2 +- modules/JsonPatch | 2 +- modules/KestrelHttpServer | 2 +- modules/Localization | 2 +- modules/Logging | 2 +- modules/MetaPackages | 2 +- modules/Mvc | 2 +- modules/MvcPrecompilation | 2 +- modules/Options | 2 +- modules/Razor | 2 +- modules/ResponseCaching | 2 +- modules/Routing | 2 +- modules/Scaffolding | 2 +- modules/Security | 2 +- modules/ServerTests | 2 +- modules/Session | 2 +- modules/SignalR | 2 +- modules/StaticFiles | 2 +- modules/Templating | 2 +- modules/WebSockets | 2 +- version.props | 4 +- 49 files changed, 323 insertions(+), 307 deletions(-) diff --git a/build/artifacts.props b/build/artifacts.props index dae497a65d..b24083f635 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -20,16 +20,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -42,12 +105,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -56,13 +164,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/external-dependencies.props b/build/external-dependencies.props index 7a491d2990..e0ae9909d7 100644 --- a/build/external-dependencies.props +++ b/build/external-dependencies.props @@ -161,223 +161,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/repo.targets b/build/repo.targets index 21e585ec5d..e6daa1fbcc 100644 --- a/build/repo.targets +++ b/build/repo.targets @@ -41,14 +41,16 @@ + ContinueOnError="WarnAndContinue" + Condition="'%(Repository.Identity)' != ''"> + ContinueOnError="WarnAndContinue" + Condition="'%(Repository.Identity)' != ''"> @@ -257,7 +259,7 @@ - diff --git a/build/submodules.props b/build/submodules.props index 0b97a955a8..01498c9a97 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -6,54 +6,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/build/tools/NuspecBaselineGenerator/Program.cs b/build/tools/NuspecBaselineGenerator/Program.cs index 6f2e541aff..5fed30775e 100644 --- a/build/tools/NuspecBaselineGenerator/Program.cs +++ b/build/tools/NuspecBaselineGenerator/Program.cs @@ -15,14 +15,17 @@ namespace NuspecBaselineGenerator [Required] [DirectoryExists] - [Argument(0)] + [Argument(0, Description = "Path(s) to directories containing .nupkg files from previous releases.")] public string[] Directories { get; } [Required] - [Option] + [Option(Description = "The path to the artifacts.props file")] [FileExists] public string Artifacts { get; } + [Option(Description = "Show verbose output")] + public bool Verbose { get; } + private void OnExecute() { var doc = XDocument.Load(Artifacts); @@ -35,10 +38,13 @@ namespace NuspecBaselineGenerator { var identity = reader.GetIdentity(); versions.Add((identity.Id, identity.Version.ToNormalizedString())); + LogVerbose($"Found package {identity.Id}/{identity.Version} ({nupkg})"); } } } + LogVerbose($"Found {versions.Count} package(s)"); + void WriteAttribute(XElement element, string attr) { var attribute = element.Attribute(attr); @@ -68,5 +74,14 @@ namespace NuspecBaselineGenerator Console.WriteLine(" />"); } } + + private void LogVerbose(string message) + { + if (!Verbose) + { + return; + } + Console.WriteLine(message); + } } } diff --git a/korebuild-lock.txt b/korebuild-lock.txt index bc84e0cd53..9998f36c2d 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.1.1-rtm-15793 -commithash:988313f4b064d6c69fc6f7b845b6384a6af3447a +version:2.1.3-rtm-15795 +commithash:866028c9d39a52bbdef2ee6c1406493d1c0a0290 diff --git a/modules/AADIntegration b/modules/AADIntegration index 111b8d812d..bb49eeebe6 160000 --- a/modules/AADIntegration +++ b/modules/AADIntegration @@ -1 +1 @@ -Subproject commit 111b8d812dcae225bc20e115680dbf2b62da1ed9 +Subproject commit bb49eeebe64905ce705f0e70f59869085adc9dce diff --git a/modules/Antiforgery b/modules/Antiforgery index 443fe51456..c26db4bb8f 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 443fe51456f5b36166e0e34f44044392e99a1217 +Subproject commit c26db4bb8f276c6582c3beae561342c1126eee83 diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 41c0cfb1a8..d65c138c80 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 41c0cfb1a8c93547b2fd8736208227a3d8c6c4c1 +Subproject commit d65c138c80b474841ce7324cd609ea6533d7345a diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 8c7e7357d4..d6a29161ee 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 8c7e7357d40663abd8c82f7e24963d0c857cf117 +Subproject commit d6a29161ee5fffd91b3269380325970d42e5d9f0 diff --git a/modules/BrowserLink b/modules/BrowserLink index 3a52b689fb..f818b554fd 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit 3a52b689fb752811cdd1ad90695f35289e03d4d8 +Subproject commit f818b554fd86c3a476abfd602c5045cd3039b853 diff --git a/modules/CORS b/modules/CORS index ccd4d50d6f..d9f5f35b7a 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit ccd4d50d6fb9d17466d582f31f7a8618914b9a68 +Subproject commit d9f5f35b7a3a7c7512e8fecad43e5ff4ffd6b587 diff --git a/modules/Caching b/modules/Caching index cd592226ae..4dc546ecf4 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit cd592226aea44b0e6be413f636cfa552863c7a95 +Subproject commit 4dc546ecf47cfe64104457b783e172a9f4ee36be diff --git a/modules/Common b/modules/Common index 3225f2a78e..6db5f35309 160000 --- a/modules/Common +++ b/modules/Common @@ -1 +1 @@ -Subproject commit 3225f2a78ee19507372b0b1ada2f8739e667bf09 +Subproject commit 6db5f353092a3191cee71853fbbcebf81f1ce259 diff --git a/modules/Configuration b/modules/Configuration index 4fb6f12111..143012a16f 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit 4fb6f1211155833e8b72a789c23db55893d8a0b7 +Subproject commit 143012a16f63a9c666d26ec053db6fd24965e3de diff --git a/modules/DataProtection b/modules/DataProtection index b40fa1bdfb..7803b6ba25 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit b40fa1bdfbaefd48064504d5cb993b6e36daf943 +Subproject commit 7803b6ba25f7fd12828e5a09dbb321af129933b4 diff --git a/modules/DependencyInjection b/modules/DependencyInjection index 960aa7c287..4dca2813ae 160000 --- a/modules/DependencyInjection +++ b/modules/DependencyInjection @@ -1 +1 @@ -Subproject commit 960aa7c28783c26b42554cfe406e2d9d8986e98f +Subproject commit 4dca2813ae6e131c3d0d109656709283864fdf6c diff --git a/modules/Diagnostics b/modules/Diagnostics index dedefd7043..d1b1a8097b 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit dedefd7043d8cdf2d38487aa2415084597ec25e1 +Subproject commit d1b1a8097be41bd9c4408c554b190a43f3eafb99 diff --git a/modules/DotNetTools b/modules/DotNetTools index ee20ecf20e..4d3886fa37 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit ee20ecf20e4ac1f2aaffac591580d2fdc6d6f6de +Subproject commit 4d3886fa378e61ccc21e8b8adb5e1666de0ecb40 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index d6071c9e4c..da195a12c4 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit d6071c9e4c3d9fb2d1e7943aad7b77b2361ddf62 +Subproject commit da195a12c43046327ba589d20e5936ae77f190b4 diff --git a/modules/FileSystem b/modules/FileSystem index 36f88e9b39..cb0eb99f24 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 36f88e9b39b9c88a302110970c7761996f15ca3e +Subproject commit cb0eb99f2481695d48669a3daa3b34a138e3c9d1 diff --git a/modules/Hosting b/modules/Hosting index 72c28fa875..cf4654189f 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 72c28fa87555d60925e6bbab2d2e9dd8da752492 +Subproject commit cf4654189f59386d38afd66c9250cb1c423ecce6 diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index 256f7755ba..47c5edd37a 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit 256f7755bae10204ba6c3b669d2289b7de33308a +Subproject commit 47c5edd37aad2a12d14c9dea8cfb22ef48ddb005 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index f47b5e9f9e..78ce5dd2be 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit f47b5e9f9e29c16f002c86de6d908bafd4cd9783 +Subproject commit 78ce5dd2bef4e4d37fb23d2b76770421196e1085 diff --git a/modules/HttpClientFactory b/modules/HttpClientFactory index 39885c573a..3495644354 160000 --- a/modules/HttpClientFactory +++ b/modules/HttpClientFactory @@ -1 +1 @@ -Subproject commit 39885c573a70beba534001e4639ff05358fd94aa +Subproject commit 3495644354aa4bf8fc14304c2e939fb9027f857f diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 2e4a9f8987..cbbe2975bc 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 2e4a9f8987389fd9342d952316a5d51cc6962f8b +Subproject commit cbbe2975bcc1a8b1b44d0bd015d0b77a6c725c5a diff --git a/modules/IISIntegration b/modules/IISIntegration index 278a4794a8..4aa93d0bef 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit 278a4794a8091da5c72c8900fe6dc1cfda58e301 +Subproject commit 4aa93d0bef9e39f533913527713daca14382cbbc diff --git a/modules/Identity b/modules/Identity index 788e324115..7fbb5588fc 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 788e324115196d9fb1e15693266943a607644f87 +Subproject commit 7fbb5588fc9ebb976b24f97264b51962a8f0087b diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index d65a4f3b6d..a04813edc3 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit d65a4f3b6dff8b6508a9db2b91db495bcb0a6af9 +Subproject commit a04813edc3456446dfb2e8059a7589f9d405db16 diff --git a/modules/JsonPatch b/modules/JsonPatch index 1780662ac5..5d39e86f19 160000 --- a/modules/JsonPatch +++ b/modules/JsonPatch @@ -1 +1 @@ -Subproject commit 1780662ac507c9b21bf7054bc1f68ccd07ed93ff +Subproject commit 5d39e86f1985d99d0c530e312d5b478ddc8682a4 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 11ddd9174c..7f49500ffa 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 11ddd9174c7c2af231ad70cf3efad85012e2fd73 +Subproject commit 7f49500ffac8c0d6528ba9c7e331aed6683f89fa diff --git a/modules/Localization b/modules/Localization index ebe067fa0f..bd43a693aa 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit ebe067fa0faa6db33f56fa08fa34921477993379 +Subproject commit bd43a693aac3decd8137816496f84c1842b846ad diff --git a/modules/Logging b/modules/Logging index 7b9db0d874..13c6e50447 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 7b9db0d874046496ee76547558808151e9a267d5 +Subproject commit 13c6e50447e0922522ad75199c1c359c5a589cd4 diff --git a/modules/MetaPackages b/modules/MetaPackages index 337c3a3a70..e4d891c6f6 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 337c3a3a7013709e07fa47c7bc5b5745092c5389 +Subproject commit e4d891c6f67c9f8e3105081d338091b05f357296 diff --git a/modules/Mvc b/modules/Mvc index 9d3243c38d..78fc49ba0c 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit 9d3243c38d1ecd6bb004d040aefb567b3bedd332 +Subproject commit 78fc49ba0c8ad7859e1f3a8aa6c3d17c7cd11f5a diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index c6b52cf95a..7bf7b14cf8 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit c6b52cf95a9c2b35d6acd380d85613354249f2fd +Subproject commit 7bf7b14cf8540fa9b558a75a9ed9bfc0a10d29f8 diff --git a/modules/Options b/modules/Options index bee9916eeb..8aee0a2143 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit bee9916eebb1071eb57efbe2674a95d774e90337 +Subproject commit 8aee0a21430299dab73d59b661564997215912c5 diff --git a/modules/Razor b/modules/Razor index 67bbd067d5..c7fafa1e63 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit 67bbd067d53e230c7159c04a7a58e56f5202d083 +Subproject commit c7fafa1e639ad30b39c608d7c264ae2bce98121f diff --git a/modules/ResponseCaching b/modules/ResponseCaching index 9e7c650c8a..88796f41f8 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit 9e7c650c8a22158fc1099fa1f028bca93166fc8a +Subproject commit 88796f41f879e201504d1d21fb2a6b45032d5e40 diff --git a/modules/Routing b/modules/Routing index 12912ae6eb..ebab62c766 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 12912ae6eb34c780e85b0a44a9b6e40e0520ad67 +Subproject commit ebab62c7666b26fe0f98546cbb210352a7fa1d1d diff --git a/modules/Scaffolding b/modules/Scaffolding index 7a7f6e0d05..9bcbfb021e 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 7a7f6e0d05f8a2432b6489c760abdfbf1ca0af7a +Subproject commit 9bcbfb021e6b5d64dd849e885b4cefd0cb3178b0 diff --git a/modules/Security b/modules/Security index ac1a9ef6d1..26fbad0614 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit ac1a9ef6d183a94646a4b5e57b7be1c6e53b5605 +Subproject commit 26fbad061475e4cf8d27d0e364048a924ead953b diff --git a/modules/ServerTests b/modules/ServerTests index e4da015591..60564e7d5b 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit e4da0155910aad63360d47822d6b8affd4a2f61b +Subproject commit 60564e7d5bb63ae2d6cc0137c5fbd508eddd2e17 diff --git a/modules/Session b/modules/Session index 2d910089bc..246aedb5bf 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit 2d910089bc05f4ef35bb5807b648ebf557c7a408 +Subproject commit 246aedb5bf97059d25cc3e2d8de715de5156f6f6 diff --git a/modules/SignalR b/modules/SignalR index 559d93c15e..6c0770398d 160000 --- a/modules/SignalR +++ b/modules/SignalR @@ -1 +1 @@ -Subproject commit 559d93c15e10c2025ec9406612c0eaabb1fd7e2b +Subproject commit 6c0770398de0221ac0fc30550aec9a9f649e9317 diff --git a/modules/StaticFiles b/modules/StaticFiles index 8109246248..d1235cdda0 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit 8109246248cfff0a67d1a9774bff443c8b6e7f23 +Subproject commit d1235cdda0c40541cf8e50f475f6d2168d624eb9 diff --git a/modules/Templating b/modules/Templating index 4ff022bd70..a6b303c83c 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit 4ff022bd7010a7b517d265ef3e121e4995f324f4 +Subproject commit a6b303c83c1cd4d4e0d302e07064713eafa3ed39 diff --git a/modules/WebSockets b/modules/WebSockets index 76e31009e3..7922b27c65 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit 76e31009e3f13c8deddd6c1829e05726924185cb +Subproject commit 7922b27c65a94ba952aefc1306aaa1f7e5f5c58d diff --git a/version.props b/version.props index 81ac3b82ce..43106355c0 100644 --- a/version.props +++ b/version.props @@ -2,14 +2,14 @@ 2 1 - 2 + 3 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) rtm $(VersionPrefix) - 0.1.2 + 0.1.3 rtm $(PrereleaseVersionLabel) From 91a1d2de503d2196975e9d89355172ad7b7f81a9 Mon Sep 17 00:00:00 2001 From: Nate McMaster Date: Wed, 27 Jun 2018 14:56:10 -0700 Subject: [PATCH 7/9] Add unit tests for the shared framework (#1228) Changes: * Add a test project with simple unit tests for the shared framework * Add root-level Directory.Build.props/targets files * Cleanup .csproj files to reduce duplication --- Directory.Build.props | 6 ++ Directory.Build.targets | 6 ++ Microsoft.AspNetCore.sln | 39 ++++++++ build/SharedFx.targets | 19 +++- build/common.props | 4 - build/dependencies.props | 1 + build/tasks/RepoTasks.csproj | 2 - build/tools/templates/Archive/Archive.csproj | 4 - .../tools/templates/SharedFx/SharedFx.csproj | 5 +- src/Directory.Build.props | 9 +- .../Microsoft.AspNetCore.All.csproj | 2 - .../Microsoft.AspNetCore.Analyzers.csproj | 2 - .../Microsoft.AspNetCore.App.csproj | 2 - test/SharedFx.UnitTests/AssertEx.cs | 35 +++++++ .../SharedFx.UnitTests.csproj | 39 ++++++++ test/SharedFx.UnitTests/SharedFxTests.cs | 97 +++++++++++++++++++ test/SharedFx.UnitTests/TestData.cs | 24 +++++ test/SharedFx.UnitTests/TestDataAttribute.cs | 20 ++++ version.props | 1 + 19 files changed, 291 insertions(+), 26 deletions(-) create mode 100644 Directory.Build.props create mode 100644 Directory.Build.targets create mode 100644 Microsoft.AspNetCore.sln create mode 100644 test/SharedFx.UnitTests/AssertEx.cs create mode 100644 test/SharedFx.UnitTests/SharedFx.UnitTests.csproj create mode 100644 test/SharedFx.UnitTests/SharedFxTests.cs create mode 100644 test/SharedFx.UnitTests/TestData.cs create mode 100644 test/SharedFx.UnitTests/TestDataAttribute.cs diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000000..758d1c575c --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,6 @@ + + + + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000000..692f3a81da --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,6 @@ + + + $(MicrosoftNETCoreApp21PackageVersion) + $(NETStandardLibrary20PackageVersion) + + diff --git a/Microsoft.AspNetCore.sln b/Microsoft.AspNetCore.sln new file mode 100644 index 0000000000..809b017e25 --- /dev/null +++ b/Microsoft.AspNetCore.sln @@ -0,0 +1,39 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{EE2CAA71-82AA-41C0-AE87-5B4FB77D6CFE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SharedFx.UnitTests", "test\SharedFx.UnitTests\SharedFx.UnitTests.csproj", "{99CC38EC-902B-4B3F-AD33-177018110199}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|Any CPU.Build.0 = Debug|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x64.ActiveCfg = Debug|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x64.Build.0 = Debug|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x86.ActiveCfg = Debug|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Debug|x86.Build.0 = Debug|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Release|Any CPU.ActiveCfg = Release|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Release|Any CPU.Build.0 = Release|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x64.ActiveCfg = Release|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x64.Build.0 = Release|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x86.ActiveCfg = Release|Any CPU + {99CC38EC-902B-4B3F-AD33-177018110199}.Release|x86.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {99CC38EC-902B-4B3F-AD33-177018110199} = {EE2CAA71-82AA-41C0-AE87-5B4FB77D6CFE} + EndGlobalSection +EndGlobal diff --git a/build/SharedFx.targets b/build/SharedFx.targets index 3abd1b30e5..ed0bb6cf96 100644 --- a/build/SharedFx.targets +++ b/build/SharedFx.targets @@ -197,7 +197,7 @@ - + @@ -528,6 +528,21 @@ Overwrite="true"/> - + + + + + $(RepositoryRoot)\test\SharedFx.UnitTests\SharedFx.UnitTests.csproj + + DotNetRestoreSourcePropsPath=$(GeneratedRestoreSourcesPropsPath); + DotNetPackageVersionPropsPath=$(GeneratedPackageVersionPropsPath); + SharedFxOutputPath=$(SharedFxIntermediateOutputPath); + RepositoryCommit=$(RepositoryCommit); + SharedFxRuntimeIdentifier=$(SharedFXRid) + + + + + diff --git a/build/common.props b/build/common.props index 6552ad98ea..b34f91a0b1 100644 --- a/build/common.props +++ b/build/common.props @@ -11,8 +11,4 @@ true - - - - diff --git a/build/dependencies.props b/build/dependencies.props index e86f1495f9..119224bdb4 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -11,6 +11,7 @@ $(MicrosoftNETCoreAppPackageVersion) + $(MicrosoftNETCoreApp21PackageVersion) $(KoreBuildVersion) diff --git a/build/tasks/RepoTasks.csproj b/build/tasks/RepoTasks.csproj index 7c95128fdd..6be1f375d2 100644 --- a/build/tasks/RepoTasks.csproj +++ b/build/tasks/RepoTasks.csproj @@ -1,7 +1,5 @@ - - netcoreapp2.0 diff --git a/build/tools/templates/Archive/Archive.csproj b/build/tools/templates/Archive/Archive.csproj index e993fa7126..e2843be0e0 100644 --- a/build/tools/templates/Archive/Archive.csproj +++ b/build/tools/templates/Archive/Archive.csproj @@ -1,12 +1,8 @@ - - netcoreapp2.1 false - netcoreapp2.1 - $(RestoreSources);$(DotNetRestoreSources); true true diff --git a/build/tools/templates/SharedFx/SharedFx.csproj b/build/tools/templates/SharedFx/SharedFx.csproj index 24bd3aad7e..14e621ae49 100644 --- a/build/tools/templates/SharedFx/SharedFx.csproj +++ b/build/tools/templates/SharedFx/SharedFx.csproj @@ -1,12 +1,9 @@ - - - + netcoreapp2.1 true true - $(RestoreSources);$(DotNetRestoreSources); diff --git a/src/Directory.Build.props b/src/Directory.Build.props index 79ca86d0bb..34fdc31455 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -1,6 +1,7 @@ - - - - + + + + + diff --git a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj index 6df70d6f22..25ed991894 100644 --- a/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj +++ b/src/Microsoft.AspNetCore.All/Microsoft.AspNetCore.All.csproj @@ -1,7 +1,5 @@ - - false false diff --git a/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj b/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj index 5927d10ad9..a9f9071719 100644 --- a/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj +++ b/src/Microsoft.AspNetCore.Analyzers/Microsoft.AspNetCore.Analyzers.csproj @@ -1,7 +1,5 @@ - - false false diff --git a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj index d87e940d0c..25e863ae37 100644 --- a/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj +++ b/src/Microsoft.AspNetCore.App/Microsoft.AspNetCore.App.csproj @@ -1,7 +1,5 @@ - - false false diff --git a/test/SharedFx.UnitTests/AssertEx.cs b/test/SharedFx.UnitTests/AssertEx.cs new file mode 100644 index 0000000000..c68147c1f6 --- /dev/null +++ b/test/SharedFx.UnitTests/AssertEx.cs @@ -0,0 +1,35 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using Xunit.Sdk; + +namespace Microsoft.AspNetCore +{ + public class AssertEx + { + public static void DirectoryExists(string path) + { + if (!Directory.Exists(path)) + { + throw new XunitException($"Expected directory to exist at {path} but it did not"); + } + } + + public static void FileExists(string path) + { + if (!File.Exists(path)) + { + throw new XunitException($"Expected file to exist at {path} but it did not"); + } + } + + public static void FileDoesNotExists(string path) + { + if (File.Exists(path)) + { + throw new XunitException($"File should not exist at {path}"); + } + } + } +} diff --git a/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj new file mode 100644 index 0000000000..31a39f032c --- /dev/null +++ b/test/SharedFx.UnitTests/SharedFx.UnitTests.csproj @@ -0,0 +1,39 @@ + + + + netcoreapp2.1 + Microsoft.AspNetCore + + + + + <_Parameter1>PackageVersion + <_Parameter2>$(PackageVersion) + + + <_Parameter1>DotNetRoot + <_Parameter2>$(SharedFxOutputPath) + + + <_Parameter1>SharedFxRuntimeIdentifier + <_Parameter2>$(SharedFxRuntimeIdentifier) + + + <_Parameter1>RepositoryCommit + <_Parameter2>$(RepositoryCommit) + + + <_Parameter1>MicrosoftNETCoreAppPackageVersion + <_Parameter2>$(MicrosoftNETCoreAppPackageVersion) + + + + + + + + + + + + diff --git a/test/SharedFx.UnitTests/SharedFxTests.cs b/test/SharedFx.UnitTests/SharedFxTests.cs new file mode 100644 index 0000000000..d18fa17ef8 --- /dev/null +++ b/test/SharedFx.UnitTests/SharedFxTests.cs @@ -0,0 +1,97 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.IO; +using Newtonsoft.Json.Linq; +using Xunit; + +namespace Microsoft.AspNetCore +{ + public class SharedFxTests + { + [Theory] + [MemberData(nameof(GetSharedFxConfig))] + public void ItContainsValidRuntimeConfigFile(SharedFxConfig config) + { + var root = TestData.GetDotNetRoot(); + var dir = Path.Combine(root, "shared", config.Name, config.Version); + var runtimeConfigFilePath = Path.Combine(dir, config.Name + ".runtimeconfig.json"); + + AssertEx.FileExists(runtimeConfigFilePath); + AssertEx.FileDoesNotExists(Path.Combine(dir, config.Name + ".runtimeconfig.dev.json")); + + var runtimeConfig = JObject.Parse(File.ReadAllText(runtimeConfigFilePath)); + + Assert.Equal(config.BaseSharedFxName, (string)runtimeConfig["runtimeOptions"]["framework"]["name"]); + Assert.Equal("netcoreapp" + config.Version.Substring(0, 3), (string)runtimeConfig["runtimeOptions"]["tfm"]); + + Assert.Equal(config.BaseSharedFxVersion, (string)runtimeConfig["runtimeOptions"]["framework"]["version"]); + } + + [Theory] + [MemberData(nameof(GetSharedFxConfig))] + public void ItContainsValidDepsJson(SharedFxConfig config) + { + var root = TestData.GetDotNetRoot(); + var dir = Path.Combine(root, "shared", config.Name, config.Version); + var depsFilePath = Path.Combine(dir, config.Name + ".deps.json"); + + var target = $".NETCoreApp,Version=v{config.Version.Substring(0, 3)}/{config.RuntimeIdentifier}"; + + AssertEx.FileExists(depsFilePath); + + var depsFile = JObject.Parse(File.ReadAllText(depsFilePath)); + + Assert.Equal(target, (string)depsFile["runtimeTarget"]["name"]); + Assert.NotNull(depsFile["targets"][target]); + Assert.NotNull(depsFile["compilationOptions"]); + Assert.Empty(depsFile["compilationOptions"]); + Assert.NotEmpty(depsFile["runtimes"][config.RuntimeIdentifier]); + } + + [Theory] + [MemberData(nameof(GetSharedFxConfig))] + public void ItContainsVersionFile(SharedFxConfig config) + { + var root = TestData.GetDotNetRoot(); + var versionFile = Path.Combine(root, "shared", config.Name, config.Version, ".version"); + AssertEx.FileExists(versionFile); + var lines = File.ReadAllLines(versionFile); + Assert.Equal(2, lines.Length); + Assert.Equal(TestData.GetRepositoryCommit(), lines[0]); + Assert.Equal(config.Version, lines[1]); + } + + + public static TheoryData GetSharedFxConfig() + => new TheoryData + { + new SharedFxConfig + { + Name = "Microsoft.AspNetCore.All", + Version = TestData.GetPackageVersion(), + // Intentionally assert aspnetcore frameworks align versions with each other and netcore + BaseSharedFxVersion = TestData.GetPackageVersion(), + BaseSharedFxName = "Microsoft.AspNetCore.App", + RuntimeIdentifier = TestData.GetSharedFxRuntimeIdentifier(), + }, + new SharedFxConfig + { + Name = "Microsoft.AspNetCore.App", + Version = TestData.GetPackageVersion(), + BaseSharedFxName = "Microsoft.NETCore.App", + BaseSharedFxVersion = TestData.GetMicrosoftNETCoreAppPackageVersion(), + RuntimeIdentifier = TestData.GetSharedFxRuntimeIdentifier(), + }, + }; + + public class SharedFxConfig + { + public string Name { get; set; } + public string Version { get; set; } + public string BaseSharedFxName { get; set; } + public string BaseSharedFxVersion { get; set; } + public string RuntimeIdentifier { get; set; } + } + } +} diff --git a/test/SharedFx.UnitTests/TestData.cs b/test/SharedFx.UnitTests/TestData.cs new file mode 100644 index 0000000000..eb01f60e8b --- /dev/null +++ b/test/SharedFx.UnitTests/TestData.cs @@ -0,0 +1,24 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System.Linq; +using System.Reflection; + +namespace Microsoft.AspNetCore +{ + public class TestData + { + public static string GetPackageVersion() => GetTestDataValue("PackageVersion"); + + public static string GetMicrosoftNETCoreAppPackageVersion() => GetTestDataValue("MicrosoftNETCoreAppPackageVersion"); + + public static string GetDotNetRoot() => GetTestDataValue("DotNetRoot"); + + public static string GetRepositoryCommit() => GetTestDataValue("RepositoryCommit"); + + public static string GetSharedFxRuntimeIdentifier() => GetTestDataValue("SharedFxRuntimeIdentifier"); + + private static string GetTestDataValue(string key) + => typeof(TestData).Assembly.GetCustomAttributes().Single(d => d.Key == key).Value; + } +} diff --git a/test/SharedFx.UnitTests/TestDataAttribute.cs b/test/SharedFx.UnitTests/TestDataAttribute.cs new file mode 100644 index 0000000000..68085e6807 --- /dev/null +++ b/test/SharedFx.UnitTests/TestDataAttribute.cs @@ -0,0 +1,20 @@ +// Copyright (c) .NET Foundation. All rights reserved. +// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information. + +using System; + +namespace Microsoft.AspNetCore +{ + [AttributeUsage(AttributeTargets.Assembly, AllowMultiple = true)] + internal class TestDataAttribute : Attribute + { + public TestDataAttribute(string key, string value) + { + Key = key; + Value = value; + } + + public string Key { get; } + public string Value { get; } + } +} diff --git a/version.props b/version.props index 43106355c0..1652259436 100644 --- a/version.props +++ b/version.props @@ -5,6 +5,7 @@ 3 $(AspNetCoreMajorVersion).$(AspNetCoreMinorVersion).$(AspNetCorePatchVersion) rtm + t000 $(VersionPrefix) From e17f426e92676acd3b7d277135babdecf449ecb1 Mon Sep 17 00:00:00 2001 From: John Luo Date: Tue, 26 Jun 2018 19:31:15 -0700 Subject: [PATCH 8/9] Update DotnetArchive version --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 119224bdb4..16e179cff9 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -49,7 +49,7 @@ 2.8.0 4.5.0 1.7.0 - 0.2.0-beta-62606-02 + 0.2.0-beta-63019-01 1.0.0-rc3-003121 2.1.0 1.1.0 From 96c5b3c2ae3f9f2d5462447ee2df8a0c5359c758 Mon Sep 17 00:00:00 2001 From: John Luo Date: Mon, 18 Jun 2018 12:15:33 -0700 Subject: [PATCH 9/9] Update StackExchange.Redis.StrongName version --- build/dependencies.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/dependencies.props b/build/dependencies.props index 16e179cff9..f0587a1537 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -98,7 +98,7 @@ 1.1.11 1.1.11 1.1.11 - 1.2.4 + 1.2.6 1.1.92 1.0.0 4.5.0