Imported Upstream version 5.0.0.42

Former-commit-id: fd56571888259555122d8a0f58c68838229cea2b

mcs/class/referencesource/System.Core/System/Linq/Expressions/ExpressionVisitor.cs

@@ -80,10 +80,14 @@ namespace System.Linq.Expressions {
                 case ExpressionType.ListInit:
                     return this.VisitListInit((ListInitExpression)exp);
                 default:
-                    throw Error.UnhandledExpressionType(exp.NodeType);
+                    throw UnhandledExpressionType(exp.NodeType);
             }
         }
 
+        static Exception UnhandledExpressionType(object p0) {
+            return new ArgumentException(string.Format ("Unhandled Expression Type: {0}", p0));
+        }        
+
         internal virtual MemberBinding VisitBinding(MemberBinding binding) {
             switch (binding.BindingType) {
                 case MemberBindingType.Assignment:
@@ -93,9 +97,13 @@ namespace System.Linq.Expressions {
                 case MemberBindingType.ListBinding:
                     return this.VisitMemberListBinding((MemberListBinding)binding);
                 default:
-                    throw Error.UnhandledBindingType(binding.BindingType);
+                    throw UnhandledBindingType(binding.BindingType);
             }
         }
+
+        static Exception UnhandledBindingType(object p0) {
+            return new ArgumentException(string.Format ("Unhandled Binding Type: {0}", p0));
+        }        
         
         internal virtual ElementInit VisitElementInitializer(ElementInit initializer) {
             ReadOnlyCollection<Expression> arguments = this.VisitExpressionList(initializer.Arguments);

mcs/class/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Binary/UnionQueryOperator.cs

@@ -189,7 +189,9 @@ namespace System.Linq.Parallel
 
             private QueryOperatorEnumerator<Pair<TInputOutput, NoKeyMemoizationRequired>, TLeftKey> m_leftSource; // Left data source.
             private QueryOperatorEnumerator<Pair<TInputOutput, NoKeyMemoizationRequired>, TRightKey> m_rightSource; // Right data source.
+#if !MONO
             private readonly int m_partitionIndex; // The current partition.
+#endif
             private Set<TInputOutput> m_hashLookup; // The hash lookup, used to produce the union.
             private CancellationToken m_cancellationToken;
             private Shared<int> m_outputLoopCount;
@@ -210,7 +212,9 @@ namespace System.Linq.Parallel
 
                 m_leftSource = leftSource;
                 m_rightSource = rightSource;
+#if !MONO
                 m_partitionIndex = partitionIndex;
+#endif
                 m_comparer = comparer;
                 m_cancellationToken = cancellationToken;
             }

mcs/class/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Options/OrderingQueryOperator.cs

@@ -23,8 +23,10 @@ namespace System.Linq.Parallel
     /// <typeparam name="TSource"></typeparam>
     internal sealed class OrderingQueryOperator<TSource> : QueryOperator<TSource>
     {
+#if !MONO
         // Turns on order (AsOrdered) or turns off order (AsUnordered)
         private bool m_orderOn;
+#endif
         private QueryOperator<TSource> m_child;
         private OrdinalIndexState m_ordinalIndexState;
 
@@ -33,7 +35,9 @@ namespace System.Linq.Parallel
         {
             m_child = child;
             m_ordinalIndexState = m_child.OrdinalIndexState;
+#if !MONO
             m_orderOn = orderOn;
+#endif
         }
 
         internal override QueryResults<TSource> Open(QuerySettings settings, bool preferStriping)

mcs/class/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/ConcatQueryOperator.cs

@@ -233,7 +233,9 @@ namespace System.Linq.Parallel
 
         class ConcatQueryOperatorResults : BinaryQueryOperatorResults
         {
+#if !MONO
             ConcatQueryOperator<TSource> m_concatOp; // Operator that generated the results
+#endif
             int m_leftChildCount; // The number of elements in the left child result set
             int m_rightChildCount; // The number of elements in the right child result set
 
@@ -260,7 +262,9 @@ namespace System.Linq.Parallel
                 bool preferStriping)
                 : base(leftChildQueryResults, rightChildQueryResults, concatOp, settings, preferStriping)
             {
+#if !MONO
                 m_concatOp = concatOp;
+#endif
                 Contract.Assert(leftChildQueryResults.IsIndexible && rightChildQueryResults.IsIndexible);
 
                 m_leftChildCount = leftChildQueryResults.ElementsCount;

mcs/class/referencesource/System.Core/System/Linq/Parallel/QueryOperators/Unary/SortQueryOperator.cs

@@ -150,7 +150,9 @@ namespace System.Linq.Parallel
         protected QueryResults<TInputOutput> m_childQueryResults; // Results of the child query
         private SortQueryOperator<TInputOutput, TSortKey> m_op; // Operator that generated these results
         private QuerySettings m_settings; // Settings collected from the query
+#if !MONO
         private bool m_preferStriping; // If the results are indexible, should we use striping when partitioning them
+#endif
 
         internal SortQueryOperatorResults(
             QueryResults<TInputOutput> childQueryResults, SortQueryOperator<TInputOutput, TSortKey> op,
@@ -159,7 +161,9 @@ namespace System.Linq.Parallel
             m_childQueryResults = childQueryResults;
             m_op = op;
             m_settings = settings;
+#if !MONO
             m_preferStriping = preferStriping;
+#endif
         }
 
         internal override bool IsIndexible

mcs/class/referencesource/System.Core/System/Linq/Parallel/Scheduling/OrderPreservingPipeliningSpoolingTask.cs

@@ -25,7 +25,9 @@ namespace System.Linq.Parallel
     class OrderPreservingPipeliningSpoolingTask<TOutput, TKey> : SpoolingTaskBase
     {
         private readonly QueryTaskGroupState m_taskGroupState; // State shared among tasks.
+#if !MONO
         private readonly TaskScheduler m_taskScheduler; // The task manager to execute the query.
+#endif
         private readonly QueryOperatorEnumerator<TOutput, TKey> m_partition; // The source partition.
         private readonly bool[] m_consumerWaiting; // Whether a consumer is waiting on a particular producer
         private readonly bool[] m_producerWaiting; // Whether a particular producer is waiting on the consumer
@@ -83,7 +85,9 @@ namespace System.Linq.Parallel
             m_partitionIndex = partitionIndex;
             m_buffers = buffers;
             m_bufferLock = bufferLock;
+#if !MONO
             m_taskScheduler = taskScheduler;
+#endif
             m_autoBuffered = autoBuffered;
         }
 

mcs/class/referencesource/System.Core/System/Linq/Parallel/Utils/Sorting.cs

@@ -70,11 +70,15 @@ namespace System.Linq.Parallel
             Contract.Assert(sharedkeys != null);
             Contract.Assert(sharedValues != null);
             Contract.Assert(sharedBarriers != null);
+#if !MONO
             Contract.Assert(groupState.CancellationState.MergedCancellationToken != null);
+#endif
             Contract.Assert(sharedIndices.Length <= sharedkeys.Length);
             Contract.Assert(sharedIndices.Length == sharedValues.Length);
             Contract.Assert(sharedIndices.Length == sharedBarriers.GetLength(1));
+#if !MONO            
             Contract.Assert(groupState.CancellationState.MergedCancellationToken != null);
+#endif
 
             m_source = source;
             m_partitionCount = partitionCount;

mcs/class/referencesource/System.Core/System/Linq/SequenceQuery.cs

@@ -101,7 +101,9 @@ namespace System.Linq {
         object IQueryProvider.Execute(Expression expression){
             if (expression == null)
                 throw Error.ArgumentNull("expression");
+#if !MONO
             Type execType = typeof(EnumerableExecutor<>).MakeGenericType(expression.Type);
+#endif
             return EnumerableExecutor.Create(expression).ExecuteBoxed();
         }
 
@@ -194,7 +196,9 @@ namespace System.Linq {
 
             // check for args changed
             if (obj != m.Object || args != m.Arguments) {
+#if !MONO
                 Expression[] argArray = args.ToArray();
+#endif
                 Type[] typeArgs = (m.Method.IsGenericMethod) ? m.Method.GetGenericArguments() : null;
 
                 if ((m.Method.IsStatic || m.Method.DeclaringType.IsAssignableFrom(obj.Type)) 

mcs/class/referencesource/System.Data.Linq/misc/SecurityUtils.cs

@@ -37,7 +37,7 @@ namespace System.Windows.Forms
     /// </devdoc>
     internal static class SecurityUtils {
 
-#if FEATURE_MONO_CAS
+#if MONO_FEATURE_CAS
         private static volatile ReflectionPermission memberAccessPermission = null;
         private static volatile ReflectionPermission restrictedMemberAccessPermission = null;
 
@@ -62,7 +62,7 @@ namespace System.Windows.Forms
 #endif
 
         private static void DemandReflectionAccess(Type type) {
-#if FEATURE_MONO_CAS
+#if MONO_FEATURE_CAS
             try {
                 MemberAccessPermission.Demand();
             }
@@ -74,7 +74,7 @@ namespace System.Windows.Forms
 
         [SecuritySafeCritical]
         private static void DemandGrantSet(Assembly assembly) {
-#if FEATURE_MONO_CAS
+#if MONO_FEATURE_CAS
             PermissionSet targetGrantSet = assembly.PermissionSet;
             targetGrantSet.AddPermission(RestrictedMemberAccessPermission);
             targetGrantSet.Demand();
@@ -82,7 +82,7 @@ namespace System.Windows.Forms
         }
 
         private static bool HasReflectionPermission(Type type) {
-#if FEATURE_MONO_CAS
+#if MONO_FEATURE_CAS
             try {
                 DemandReflectionAccess(type);
                 return true;

mcs/class/referencesource/System.Data.SqlXml/System/Xml/Xsl/XsltOld/Compiler.cs

@@ -164,7 +164,7 @@ namespace System.Xml.Xsl.XsltOld {
         // The World of Compile
         //
         internal void Compile(NavigatorInput input, XmlResolver xmlResolver, Evidence evidence) {
-#if !FEATURE_MONO_CAS
+#if !MONO_FEATURE_CAS
             evidence = null;
 #endif
             Debug.Assert(input != null);
@@ -800,7 +800,7 @@ namespace System.Xml.Xsl.XsltOld {
                         compilParams.Evidence = evidence;
 #pragma warning restore 618
                         compilParams.ReferencedAssemblies.Add(typeof(XPathNavigator).Module.FullyQualifiedName);
-                        compilParams.ReferencedAssemblies.Add("system.dll");
+                        compilParams.ReferencedAssemblies.Add("System.dll");
 #if !FEATURE_PAL // visualbasic
                         if (lang == ScriptingLanguage.VisualBasic) {
                             compilParams.ReferencedAssemblies.Add("microsoft.visualbasic.dll");

mcs/class/referencesource/System.Data/System/Data/CodeGen/datacache.cs

@@ -682,7 +682,7 @@ namespace System.Data {
                     //\\ this.Prefix = "<Prefix>";
                     tableInitClass.Statements.Add(Assign(Property(This(), "Prefix"), Str(table.Prefix)));
                 }
-                if (table.tableNamespace != null) {
+                if (table._tableNamespace != null) {
                     //\\ this.Namespace = <Namespace>;
                     tableInitClass.Statements.Add(Assign(Property(This(), "Namespace"), Str(table.Namespace)));
                 }
@@ -691,7 +691,7 @@ namespace System.Data {
                     //\\ this.MinimumCapacity = <MinimumCapacity>;
                     tableInitClass.Statements.Add(Assign(Property(This(), "MinimumCapacity"), Primitive(table.MinimumCapacity)));
                 }
-                if (table.displayExpression != null) {
+                if (table._displayExpression != null) {
                     //\\ this.DisplayExpression = "<DisplayExpression>";
                     tableInitClass.Statements.Add(Assign(Property(This(), "DisplayExpression"), Str(table.DisplayExpressionInternal)));
                 }

mcs/class/referencesource/System.Data/System/Data/Common/AdapterUtil.cs.REMOVED.git-id

@@ -1 +1 @@
-662c1c9130d8b675f4109598e703ac7e2a22bf93
+1e5ea43e2710b9e2f6698d8b679b66e4c28040a4

mcs/class/referencesource/System.Data/System/Data/Common/DBDataPermissionAttribute.cs

@@ -90,14 +90,4 @@ namespace System.Data.Common {
             return (null != _restrictions);
         }
     }
-}
-
-namespace System.Data { // MDAC 83087
-
-[Serializable] 
-    
-    public enum KeyRestrictionBehavior { // V1.0.5000
-        AllowOnly    = 0,
-        PreventUsage = 1,
-    }
-}
+}

mcs/class/referencesource/System.Data/System/Data/Common/SQLTypes/SqlXmlStorage.cs

@@ -45,7 +45,7 @@ namespace System.Data.Common {
             catch (OverflowException) {
                 throw ExprException.Overflow(typeof(SqlXml));
             }
-            throw ExceptionBuilder.AggregateException(kind, DataType);
+            throw ExceptionBuilder.AggregateException(kind, _dataType);
         }
 
         override public int Compare(int recordNo1, int recordNo2) {

mcs/class/referencesource/System.Data/System/Data/DataColumn.cs

@@ -669,7 +669,7 @@ namespace System.Data {
                 Debug.Assert(defaultValue != null, "It should not have been set to null.");
                 if (defaultValue == DBNull.Value && this.implementsINullable) { // for perf I dont access property
                     if (_storage != null)
-                        defaultValue = _storage.NullValue;
+                        defaultValue = _storage._nullValue;
                     else if (this.isSqlType)
                             defaultValue = SqlConvert.ChangeTypeForDefaultValue(defaultValue, this.dataType, FormatProvider);
                     else if (this.implementsINullable) {
@@ -885,21 +885,21 @@ namespace System.Data {
         internal bool IsCloneable {
             get {
                 Debug.Assert(null != _storage, "no storage");
-                return _storage.IsCloneable;
+                return _storage._isCloneable;
             }
         }
 
         internal bool IsStringType {
             get {
                 Debug.Assert(null != _storage, "no storage");
-                return _storage.IsStringType;
+                return _storage._isStringType;
             }
         }
 
         internal bool IsValueType {
             get {
                 Debug.Assert(null != _storage, "no storage");
-                return _storage.IsValueType;
+                return _storage._isValueType;
             }
         }
 
@@ -1204,7 +1204,7 @@ namespace System.Data {
 
         internal void FreeRecord(int record) {
             Debug.Assert(null != _storage, "no storage");
-            _storage.Set(record, _storage.NullValue);
+            _storage.Set(record, _storage._nullValue);
         }
 
         /// <devdoc>
@@ -1395,7 +1395,7 @@ namespace System.Data {
                 return;
 
             if (sortIndex != null) {
-                if (sortIndex.IsKeyInIndex(_storage.NullValue)) {// here we do use strong typed NULL for Sql types
+                if (sortIndex.IsKeyInIndex(_storage._nullValue)) {// here we do use strong typed NULL for Sql types
                     throw ExceptionBuilder.NullKeyValues(ColumnName);
                 }
             }
@@ -1573,7 +1573,7 @@ namespace System.Data {
         internal bool IsCustomType {
             get {
                 if (null != _storage)
-                    return _storage.IsCustomDefinedType;
+                    return _storage._isCustomDefinedType;
                 return DataStorage.IsTypeCustomType(DataType);
             }
         }

mcs/class/referencesource/System.Data/System/Data/DataSet.cs.REMOVED.git-id

@@ -1 +1 @@
-44d81f07e1ef51520c0677f750ff35d1e6774efc
+d3f0497f22ebc3cc6a5a3e29b03c2f3166eb4b4b

mcs/class/referencesource/System.Data/System/Data/Sql/SqlDataSourceEnumerator.cs

@@ -40,6 +40,7 @@ namespace System.Data.Sql {
 
         override public DataTable GetDataSources() {
 #if MONO
+            timeoutTime = 0;
             throw new NotImplementedException ();
 #else
             (new NamedPermissionSet("FullTrust")).Demand(); // SQLBUDT 244304

mcs/class/referencesource/System.Data/System/Data/XMLSchema.cs.REMOVED.git-id

@@ -1 +1 @@
-6020f65eabe156245bed7a79e0b8470ba59bb710
+ae76cafbcecdede54096168ae86fe4c0cfa0f4d2

mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/ClassDataContract.cs

@@ -580,7 +580,7 @@ namespace System.Runtime.Serialization
         internal bool RequiresMemberAccessForWrite(SecurityException securityException)
         {
 
-#if FEATURE_MONO_CAS
+#if MONO_FEATURE_CAS
             EnsureMethodsImported();
 
             if (!IsTypeVisible(UnderlyingType))

mcs/class/referencesource/System.Runtime.Serialization/System/Runtime/Serialization/Globals.cs

@@ -1105,7 +1105,7 @@ namespace System.Runtime.Serialization
             }
         }
 
-#if FEATURE_MONO_CAS
+#if MONO_FEATURE_CAS
         [Fx.Tag.SecurityNote(Critical = "Holds instance of SecurityPermission that we will Demand for SerializationFormatter."
             + " Should not be modified to something else.")]
         [SecurityCritical]