diff --git a/build/artifacts.props b/build/artifacts.props index af32435c86..56d2b4a8c5 100644 --- a/build/artifacts.props +++ b/build/artifacts.props @@ -11,13 +11,57 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -27,6 +71,7 @@ + @@ -37,17 +82,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -63,8 +135,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -74,5 +190,8 @@ + + + diff --git a/build/dependencies.props b/build/dependencies.props index dd817c3995..6eb34af301 100644 --- a/build/dependencies.props +++ b/build/dependencies.props @@ -245,26 +245,8 @@ - KRB2004 - NETStandardImplicitPackageVersion - netstandard2.0 - - - KRB2004 NETStandardLibrary20PackageVersion - - - KRB2004 - NETStandardLibraryPackageVersion - net461 - - - - KRB2004 - NETStandardLibraryPackageVersion - net46 - @@ -337,141 +319,13 @@ not building again in this patch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - https://dotnet.myget.org/F/aspnet-2-0-2-october2017-patch-public/api/v3/index.json - - - - - - - - - - - @@ -479,13 +333,11 @@ not building again in this patch. - - diff --git a/build/submodules.props b/build/submodules.props index 23267bb880..ad60e882e4 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -7,53 +7,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/korebuild-lock.txt b/korebuild-lock.txt index 374126119a..df86a509a5 100644 --- a/korebuild-lock.txt +++ b/korebuild-lock.txt @@ -1,2 +1,2 @@ -version:2.0.5-rtm-10014 -commithash:768d13aef913e058dfa3bc7bafca48bc93c7e0ab +version:2.0.5-rtm-10016 +commithash:02bda79ac9c564229da734a836f258d6c1321eb7 diff --git a/korebuild.json b/korebuild.json index 6ac34cd945..9deb2b62d7 100644 --- a/korebuild.json +++ b/korebuild.json @@ -1,4 +1,4 @@ { - "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0.0/tools/korebuild.schema.json", - "channel": "release/2.0.0" + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.0/tools/korebuild.schema.json", + "channel": "release/2.0" } diff --git a/modules/Antiforgery b/modules/Antiforgery index 06b53886bd..af5623fb4b 160000 --- a/modules/Antiforgery +++ b/modules/Antiforgery @@ -1 +1 @@ -Subproject commit 06b53886bd9bfafa3e96da22d61edcbad8db3842 +Subproject commit af5623fb4bdeb5d5aa6f10a213f6f10bafd7334a diff --git a/modules/AzureIntegration b/modules/AzureIntegration index 714ea279ca..8cbc8e6a8c 160000 --- a/modules/AzureIntegration +++ b/modules/AzureIntegration @@ -1 +1 @@ -Subproject commit 714ea279ca648cd2fce0a302af9d79c708b0e954 +Subproject commit 8cbc8e6a8c9c84429e5fb2908e8c5a3b6d91da19 diff --git a/modules/BasicMiddleware b/modules/BasicMiddleware index 8319d8eb0f..8fd34cbb2f 160000 --- a/modules/BasicMiddleware +++ b/modules/BasicMiddleware @@ -1 +1 @@ -Subproject commit 8319d8eb0f2711e97ce86c9d98ec7a71d4710a21 +Subproject commit 8fd34cbb2f62cdf43a892289439b4bdf54ff9699 diff --git a/modules/BrowserLink b/modules/BrowserLink index d35de0ae6b..264e797c42 160000 --- a/modules/BrowserLink +++ b/modules/BrowserLink @@ -1 +1 @@ -Subproject commit d35de0ae6ba7f5a670387192ef0a5c5fef94a073 +Subproject commit 264e797c42d51b7eeb074e8da739f7888c67602e diff --git a/modules/CORS b/modules/CORS index 5a617d8cf1..54018f1f97 160000 --- a/modules/CORS +++ b/modules/CORS @@ -1 +1 @@ -Subproject commit 5a617d8cf152ed6cad54f93cecb8dc4dcdc47224 +Subproject commit 54018f1f97257ffae920e98525fcabfcf7f058cf diff --git a/modules/Caching b/modules/Caching index f3541e9187..d3c4b58119 160000 --- a/modules/Caching +++ b/modules/Caching @@ -1 +1 @@ -Subproject commit f3541e918714cdad4c24968292470b9531095b92 +Subproject commit d3c4b58119652b7c566fb00fcf19b907d9db18bc diff --git a/modules/Configuration b/modules/Configuration index 99777e88f9..c3f21a72ef 160000 --- a/modules/Configuration +++ b/modules/Configuration @@ -1 +1 @@ -Subproject commit 99777e88f936170830708fc51482fc23acc2dfec +Subproject commit c3f21a72efad1174ea5086e021c4798a439824d0 diff --git a/modules/DataProtection b/modules/DataProtection index 7cc58239c4..c4c6e1b0e9 160000 --- a/modules/DataProtection +++ b/modules/DataProtection @@ -1 +1 @@ -Subproject commit 7cc58239c477bcc91349f9bd217723ca46ab2da9 +Subproject commit c4c6e1b0e9667662646939139205e12bf57e865c diff --git a/modules/Diagnostics b/modules/Diagnostics index e10016ae41..df09b97669 160000 --- a/modules/Diagnostics +++ b/modules/Diagnostics @@ -1 +1 @@ -Subproject commit e10016ae41eb75199a294bb5360387dcd11c9f27 +Subproject commit df09b976698fc024a944aaa918987c6fd78b8420 diff --git a/modules/DotNetTools b/modules/DotNetTools index 8586b2d47d..78b8c3337d 160000 --- a/modules/DotNetTools +++ b/modules/DotNetTools @@ -1 +1 @@ -Subproject commit 8586b2d47d9d3e54cb349bcb156bc4bb20426e5b +Subproject commit 78b8c3337d4725b9108422cd98c951facc9067c2 diff --git a/modules/EntityFrameworkCore b/modules/EntityFrameworkCore index 984c2c87d6..b9309a7e82 160000 --- a/modules/EntityFrameworkCore +++ b/modules/EntityFrameworkCore @@ -1 +1 @@ -Subproject commit 984c2c87d67d996e2a3c578ff1a7e8e1c4e0da80 +Subproject commit b9309a7e825e0283354e6b4e4480ca74e8b2888e diff --git a/modules/EventNotification b/modules/EventNotification index b6ed5ce753..055ae09952 160000 --- a/modules/EventNotification +++ b/modules/EventNotification @@ -1 +1 @@ -Subproject commit b6ed5ce7534a7ead28cbe4bc6dc0458f53b0d4f7 +Subproject commit 055ae09952d92d2484b00dbf0724e7f9d187d12f diff --git a/modules/FileSystem b/modules/FileSystem index 73a4b45edb..3d57b55d72 160000 --- a/modules/FileSystem +++ b/modules/FileSystem @@ -1 +1 @@ -Subproject commit 73a4b45edbb14b6f3f5063400ab67f83230d5414 +Subproject commit 3d57b55d72399fddeb8eadca118b44a8c979c912 diff --git a/modules/Hosting b/modules/Hosting index 86df76440b..844f6a57af 160000 --- a/modules/Hosting +++ b/modules/Hosting @@ -1 +1 @@ -Subproject commit 86df76440b450daa3972d5b317026b58f718b803 +Subproject commit 844f6a57af553d1cb89c113a5254470b735a1bd9 diff --git a/modules/HtmlAbstractions b/modules/HtmlAbstractions index dd02e6829e..ab623aeb00 160000 --- a/modules/HtmlAbstractions +++ b/modules/HtmlAbstractions @@ -1 +1 @@ -Subproject commit dd02e6829ef4210795c17d198a97465e9b1875ea +Subproject commit ab623aeb00dd27c9a55c9a4f1662b5304f9acfb4 diff --git a/modules/HttpAbstractions b/modules/HttpAbstractions index 9cfc7502c1..022f96fc70 160000 --- a/modules/HttpAbstractions +++ b/modules/HttpAbstractions @@ -1 +1 @@ -Subproject commit 9cfc7502c15bf0f2240121d7d68b515fe16a8c95 +Subproject commit 022f96fc7078d2879ab3ca78680ef6861f66ec54 diff --git a/modules/HttpSysServer b/modules/HttpSysServer index 1b5ba87bbb..b85f18fe18 160000 --- a/modules/HttpSysServer +++ b/modules/HttpSysServer @@ -1 +1 @@ -Subproject commit 1b5ba87bbb80d798bebdf73711a09a846205c19b +Subproject commit b85f18fe18f511df0af442f5c9d3485c09b909d0 diff --git a/modules/IISIntegration b/modules/IISIntegration index f270358b27..346315f5c0 160000 --- a/modules/IISIntegration +++ b/modules/IISIntegration @@ -1 +1 @@ -Subproject commit f270358b27174f0f6a6afae44715f8176bd9d486 +Subproject commit 346315f5c0f5f6ea064fb4f0fffe930d3717d91c diff --git a/modules/Identity b/modules/Identity index 0ab57e8184..15a82284ce 160000 --- a/modules/Identity +++ b/modules/Identity @@ -1 +1 @@ -Subproject commit 0ab57e8184f524928b4e58791172b5a9d98940b1 +Subproject commit 15a82284ce52dc8932c49f3246763f3ea05a3568 diff --git a/modules/JavaScriptServices b/modules/JavaScriptServices index 79fd6debad..44d39bc0d4 160000 --- a/modules/JavaScriptServices +++ b/modules/JavaScriptServices @@ -1 +1 @@ -Subproject commit 79fd6debad12fd4e9b7fbe5af125fa05ab402c00 +Subproject commit 44d39bc0d42c7f6c5a3f61cdeead4d70f625b6e2 diff --git a/modules/KestrelHttpServer b/modules/KestrelHttpServer index 35a9432ce8..4e5bcf3f02 160000 --- a/modules/KestrelHttpServer +++ b/modules/KestrelHttpServer @@ -1 +1 @@ -Subproject commit 35a9432ce8e1bdd003309785e6ab1fa857c6eecc +Subproject commit 4e5bcf3f021eda3b6875fbf5768158cff21d8971 diff --git a/modules/Localization b/modules/Localization index 4ee17ae30b..beacd97a93 160000 --- a/modules/Localization +++ b/modules/Localization @@ -1 +1 @@ -Subproject commit 4ee17ae30bfbd464e11ceb28a5e4ee00c6141725 +Subproject commit beacd97a93a768b333e4ab30c710fbd32150a2dc diff --git a/modules/Logging b/modules/Logging index 6f6781e3fe..c2bf63ed67 160000 --- a/modules/Logging +++ b/modules/Logging @@ -1 +1 @@ -Subproject commit 6f6781e3fe98a7d8005f7b8e13e9e302c4067119 +Subproject commit c2bf63ed67058ed86dd66f6fea85532b5ed4f67a diff --git a/modules/MetaPackages b/modules/MetaPackages index 57e644b813..c5dc6f6959 160000 --- a/modules/MetaPackages +++ b/modules/MetaPackages @@ -1 +1 @@ -Subproject commit 57e644b813bf51a7e73e092995dc8511511074ba +Subproject commit c5dc6f6959af04bfe0862acaf6db9d3086dcf07f diff --git a/modules/Microsoft.Data.Sqlite b/modules/Microsoft.Data.Sqlite index 20cc6f4533..da74078a40 160000 --- a/modules/Microsoft.Data.Sqlite +++ b/modules/Microsoft.Data.Sqlite @@ -1 +1 @@ -Subproject commit 20cc6f45334c0d715d0b5387165cd5fddb5133c8 +Subproject commit da74078a40763971fe12494de9f1dbdb8daf46ab diff --git a/modules/Mvc b/modules/Mvc index c9e2d585a4..aeab6e295e 160000 --- a/modules/Mvc +++ b/modules/Mvc @@ -1 +1 @@ -Subproject commit c9e2d585a49e861fe0c2f4846dedb44cba997b16 +Subproject commit aeab6e295efdc0b1d89c375b62a84fe3b6ba969e diff --git a/modules/MvcPrecompilation b/modules/MvcPrecompilation index 46d5f4e3d0..ff55ddbd92 160000 --- a/modules/MvcPrecompilation +++ b/modules/MvcPrecompilation @@ -1 +1 @@ -Subproject commit 46d5f4e3d056310955f180da6af9ebe1333a0534 +Subproject commit ff55ddbd92b0266ac28d9f486704376dc127f611 diff --git a/modules/Options b/modules/Options index 0ea1fec422..e8275d1dee 160000 --- a/modules/Options +++ b/modules/Options @@ -1 +1 @@ -Subproject commit 0ea1fec42203b95785d6beade2e8ea6a93cdf47b +Subproject commit e8275d1dee8a4e8b03f0d87e81ebc8ef586e2fb7 diff --git a/modules/Proxy b/modules/Proxy index f0bec28f34..4665584812 160000 --- a/modules/Proxy +++ b/modules/Proxy @@ -1 +1 @@ -Subproject commit f0bec28f34e41824019c5eb87de67c73173e6a26 +Subproject commit 466558481201e2fdedbd2d7d5fdfe288aae85a98 diff --git a/modules/Razor b/modules/Razor index cff2ef2e0a..386840c82b 160000 --- a/modules/Razor +++ b/modules/Razor @@ -1 +1 @@ -Subproject commit cff2ef2e0a3a6a24c689505dcbdceec228cd6d20 +Subproject commit 386840c82b3122d06c5139955f70a2a87f2d1d0a diff --git a/modules/ResponseCaching b/modules/ResponseCaching index b0362dab9c..d4606fe791 160000 --- a/modules/ResponseCaching +++ b/modules/ResponseCaching @@ -1 +1 @@ -Subproject commit b0362dab9cd4c5bf8de364694d4880ab2c948be5 +Subproject commit d4606fe791f7b4fe746003dff6553498f039edb1 diff --git a/modules/Routing b/modules/Routing index 763aa1447e..c3cdbf67f0 160000 --- a/modules/Routing +++ b/modules/Routing @@ -1 +1 @@ -Subproject commit 763aa1447e340c4d6607b1542183817d5f08e257 +Subproject commit c3cdbf67f0606cd95eafe4194924e1ca6439da20 diff --git a/modules/Scaffolding b/modules/Scaffolding index 793c266455..4361c9bb77 160000 --- a/modules/Scaffolding +++ b/modules/Scaffolding @@ -1 +1 @@ -Subproject commit 793c266455bf499d0d30434a4ef47cf673dd81c8 +Subproject commit 4361c9bb778f2ce9d2557eaa1cf6d5d682337670 diff --git a/modules/Security b/modules/Security index 598188a29a..36e6ab673e 160000 --- a/modules/Security +++ b/modules/Security @@ -1 +1 @@ -Subproject commit 598188a29a02d7793c4fe15fbe9c88197eb81a8a +Subproject commit 36e6ab673eaf305e604333be01fc909be0fd1125 diff --git a/modules/ServerTests b/modules/ServerTests index 9533c2c643..0c313bb216 160000 --- a/modules/ServerTests +++ b/modules/ServerTests @@ -1 +1 @@ -Subproject commit 9533c2c6435fb86137de0914a93e76a04567eef5 +Subproject commit 0c313bb2164330b127e8941f91c67930bf550453 diff --git a/modules/Session b/modules/Session index 6cbe68fb3c..643c53de3d 160000 --- a/modules/Session +++ b/modules/Session @@ -1 +1 @@ -Subproject commit 6cbe68fb3c40bbf5e9c9ca2e87b0e4d51d3964f1 +Subproject commit 643c53de3d75479559391e3ffde3e24f5feb5e73 diff --git a/modules/StaticFiles b/modules/StaticFiles index f83ec642e7..6be7940dda 160000 --- a/modules/StaticFiles +++ b/modules/StaticFiles @@ -1 +1 @@ -Subproject commit f83ec642e7421f6ae133d4ef459a20729c9c16fb +Subproject commit 6be7940dda62d06c40b6e0144f1fbe0adf66c6c4 diff --git a/modules/Templating b/modules/Templating index e3674db32e..c786c029f4 160000 --- a/modules/Templating +++ b/modules/Templating @@ -1 +1 @@ -Subproject commit e3674db32e34f4b43671e978eb9902b3b11fb214 +Subproject commit c786c029f45547fd3d01be534c4634c974fe7377 diff --git a/modules/Testing b/modules/Testing index e270986c14..7d50390d3a 160000 --- a/modules/Testing +++ b/modules/Testing @@ -1 +1 @@ -Subproject commit e270986c142758ab529d6635394c76482f9c5416 +Subproject commit 7d50390d3ae3e1eea19cac017062e402e4cc212b diff --git a/modules/WebSockets b/modules/WebSockets index 5a9214e335..32c29cb3c4 160000 --- a/modules/WebSockets +++ b/modules/WebSockets @@ -1 +1 @@ -Subproject commit 5a9214e3355be3d4b8eec873e3d51e5737e061f0 +Subproject commit 32c29cb3c4ac317e93010341fc597045388d03b4 diff --git a/scripts/PatchVersionPrefix.ps1 b/scripts/PatchVersionPrefix.ps1 index b67b953b60..de09ecd311 100755 --- a/scripts/PatchVersionPrefix.ps1 +++ b/scripts/PatchVersionPrefix.ps1 @@ -14,27 +14,7 @@ param( $ErrorActionPreference = 'Stop' -function SaveXml($xml, [string]$path) { - Write-Verbose "Saving to $path" - $ErrorActionPreference = 'stop' - - $settings = New-Object System.XML.XmlWriterSettings - $settings.OmitXmlDeclaration = $true - $settings.Encoding = New-Object System.Text.UTF8Encoding( $true ) - $writer = [System.XML.XMLTextWriter]::Create($path, $settings) - $xml.Save($writer) - $writer.Close() -} - -function LoadXml([string]$path) { - Write-Verbose "Reading to $path" - - $ErrorActionPreference = 'stop' - $obj = new-object xml - $obj.PreserveWhitespace = $true - $obj.Load($path) - return $obj -} +Import-Module -Scope Local -Force "$PSScriptRoot/common.psm1" function BumpPatch([System.Xml.XmlNode]$node) { if (-not $node) { diff --git a/scripts/common.psm1 b/scripts/common.psm1 index 5ed0f0ede7..0c3397fa96 100644 --- a/scripts/common.psm1 +++ b/scripts/common.psm1 @@ -64,3 +64,25 @@ function Get-Submodules { return $submodules } + +function SaveXml([xml]$xml, [string]$path) { + Write-Verbose "Saving to $path" + $ErrorActionPreference = 'stop' + + $settings = New-Object System.XML.XmlWriterSettings + $settings.OmitXmlDeclaration = $true + $settings.Encoding = New-Object System.Text.UTF8Encoding( $true ) + $writer = [System.XML.XMLTextWriter]::Create($path, $settings) + $xml.Save($writer) + $writer.Close() +} + +function LoadXml([string]$path) { + Write-Verbose "Reading to $path" + + $ErrorActionPreference = 'stop' + $obj = new-object xml + $obj.PreserveWhitespace = $true + $obj.Load($path) + return $obj +}