Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@ -1290,7 +1290,7 @@ namespace System.Web.UI.MobileControls
}
}
// NOTE: Make sure this stays in [....] with Page.PageRegisteredControlsThatRequirePostBackKey
// NOTE: Make sure this stays in sync with Page.PageRegisteredControlsThatRequirePostBackKey
private const string PageRegisteredControlsThatRequirePostBackKey = "__ControlsRequirePostBackKey__";
private bool CheckEmptyViewState(Object viewState)
{
@ -1441,7 +1441,7 @@ namespace System.Web.UI.MobileControls
private byte[] GetMacKeyModifier()
{
//NOTE: duplicate of the version in objectstateformatter.cs, keep in [....]
//NOTE: duplicate of the version in objectstateformatter.cs, keep in sync
// Use the page's directory and class name as part of the key (ASURT 64044)
// We need to make sure that the hash is case insensitive, since the file system