mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 4.8.0.309

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

2
mcs/class/referencesource/System.Web/UI/WebControls/Calendar.cs
View File

@@ -56,7 +56,7 @@ namespace System.Web.UI.WebControls {
private ArrayList dateList;
private SelectedDatesCollection selectedDates;
private Globalization.Calendar threadCalendar;
private System.Globalization.Calendar threadCalendar;
private DateTime minSupportedDate;
private DateTime maxSupportedDate;
#if DEBUG

12
mcs/class/referencesource/System.Web/UI/WebControls/QueryExtensions.cs
View File

@@ -32,7 +32,17 @@ namespace System.Web.UI.WebControls {
}
ParameterExpression parameter = Expression.Parameter(source.ElementType, String.Empty);
MemberExpression property = Expression.Property(parameter, sortExpression);
//VSO bug 173528-- Add support for sorting by nested property names
MemberExpression property = null;
string[] sortExpressionFields = sortExpression.Split('.');
foreach (string sortExpressionField in sortExpressionFields) {
if (property == null) {
property = Expression.Property(parameter, sortExpressionField);
}
else {
property = Expression.Property(property, sortExpressionField);
}
}
LambdaExpression lambda = Expression.Lambda(property, parameter);
string methodName = (isDescending) ? "OrderByDescending" : "OrderBy" ;

4
mcs/class/referencesource/System.Web/UI/WebControls/xml.cs
View File

@@ -41,6 +41,7 @@ namespace System.Web.UI.WebControls {
[SuppressMessage("Microsoft.Security", "MSEC1220:ReviewDtdProcessingAssignment", Justification = "Dtd processing is needed for back-compat, but is being done as safely as possible.")]
[SuppressMessage("Microsoft.Security.Xml", "CA3069:ReviewDtdProcessingAssignment", Justification = "Dtd processing is needed for back-compat, but is being done as safely as possible.")]
public override void SetTagInnerText(string text) {
if (!Util.IsWhiteSpaceString(text)) {
@@ -114,7 +115,9 @@ namespace System.Web.UI.WebControls {
#pragma warning restore 0618
[SuppressMessage("Microsoft.Security", "MSEC1201:DoNotUseXslTransform", Justification = "_identityTransform contents are trusted hard-coded string.")]
[SuppressMessage("Microsoft.Security.Xml", "CA3050:DoNotUseXslTransform", Justification = "_identityTransform contents are trusted hard-coded string.")]
[SuppressMessage("Microsoft.Security", "MSEC1205:DoNotAllowDtdOnXmlTextReader", Justification = "_identityTransform contents are trusted hard-coded string.")]
[SuppressMessage("Microsoft.Security.Xml", "CA3054:DoNotAllowDtdOnXmlTextReader", Justification = "_identityTransform contents are trusted hard-coded string.")]
[PermissionSet(SecurityAction.Assert, Unrestricted = true)]
static Xml() {
@@ -332,6 +335,7 @@ namespace System.Web.UI.WebControls {
[SuppressMessage("Microsoft.Security", "MSEC1218:ReviewWebControlForSet_DocumentContent", Justification = "Legacy code that trusts our developer input. Optional safer codepath available via appSettings/aspnet:RestrictXmlControls configuration.")]
[SuppressMessage("Microsoft.Security.Xml", "CA3067:ReviewWebControlForSet_DocumentContent", Justification = "Legacy code that trusts our developer input. Optional safer codepath available via appSettings/aspnet:RestrictXmlControls configuration.")]
protected override void AddParsedSubObject(object obj) {
if (obj is LiteralControl) {
// Trim the initial whitespaces since XML is very picky (related to ASURT 58100)