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)