Imported Upstream version 4.8.0.309

Former-commit-id: 5f9c6ae75f295e057a7d2971f3a6df4656fa8850
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-11-10 13:04:39 +00:00
parent ee1447783b
commit 94b2861243
4912 changed files with 390737 additions and 49310 deletions

View File

@@ -473,6 +473,7 @@ namespace System.Text.RegularExpressions {
}
#if NETSTANDARD
[CLSCompliant (false)]
protected IDictionary Caps
{
get
@@ -500,6 +501,7 @@ namespace System.Text.RegularExpressions {
}
}
[CLSCompliant (false)]
protected IDictionary CapNames
{
get
@@ -1398,7 +1400,7 @@ namespace System.Text.RegularExpressions {
return newcached;
}
#if !(SILVERLIGHT||FULL_AOT_RUNTIME)
#if !SILVERLIGHT
/*
* True if the O option was set
*/
@@ -1408,7 +1410,11 @@ namespace System.Text.RegularExpressions {
protected bool UseOptionC() {
/* Mono: Set to false until we investigate https://bugzilla.xamarin.com/show_bug.cgi?id=25671 */
return false;
#if FULL_AOT_RUNTIME
return false;
#else
return(roptions & RegexOptions.Compiled) != 0;
#endif
}
#endif