Merge pull request #426 from WiseTechGlobal/wtg/wip/WI00119105

Fixes for various issues

Author: SergeyTeplyakov

Foxtrot/Contracts/ContractDeclarativeAssemblyAttribute.cs

@@ -11,6 +11,7 @@
 namespace System.Diagnostics.Contracts
 {
     [AttributeUsage(global::System.AttributeTargets.Assembly)]
+    [ContractVerification(false)]
     internal sealed class ContractDeclarativeAssemblyAttribute : global::System.Attribute
     {
     }

Foxtrot/Contracts/ContractDeclarativeAssemblyAttribute.vb

@@ -5,8 +5,9 @@
 '  This file is included when building a contract declarative assembly
 '  in order to mark it as such for recognition by the tools
 '
-<Assembly: ContractDeclarativeAssemblyAttribute()> 
+<Assembly: ContractDeclarativeAssemblyAttribute()>
 
+<System.Diagnostics.Contracts.ContractVerification(False)>
 NotInheritable Class ContractDeclarativeAssemblyAttribute
     Inherits Global.System.Attribute
 End Class

Microsoft.Research/Contracts/MsCorlib/System.Type.cs

@@ -870,6 +870,7 @@ public virtual Type[] GetGenericParameterConstraints() {
     public virtual MethodInfo[] GetMethods(BindingFlags arg0)
     {
       Contract.Ensures(Contract.Result<MethodInfo[]>() != null);
+      Contract.Ensures(Contract.ForAll(Contract.Result<MethodInfo[]>(), el => el != null));
 
       return default(MethodInfo[]);
     }
@@ -888,23 +889,23 @@ public virtual MethodInfo[] GetMethods()
       Contract.Ensures(Contract.Result<MethodInfo[]>() != null);
       Contract.Ensures(Contract.ForAll(Contract.Result<MethodInfo[]>(), el => el != null));
 
-      return default( MethodInfo[]);
+      return default(MethodInfo[]);
     }
 
     [Pure]
     public virtual MethodInfo GetMethod(string name)
     {
       Contract.Requires(name != null);
 
-      return default( MethodInfo);
+      return default(MethodInfo);
     }
 
     [Pure]
     public virtual MethodInfo GetMethod(string name, BindingFlags bindingAttr)
     {
       Contract.Requires(name != null);
 
-      return default( MethodInfo);
+      return default(MethodInfo);
     }
 
     [Pure]
@@ -913,7 +914,7 @@ public virtual MethodInfo GetMethod(string name, Type[] types)
       Contract.Requires(name != null);
       Contract.Requires(types != null);
 
-      return default( MethodInfo);
+      return default(MethodInfo);
     }
     //public  MethodInfo GetMethod(string name, Type[] types,  ParameterModifier[] modifiers)
     //{
@@ -942,7 +943,7 @@ public virtual ConstructorInfo[] GetConstructors(BindingFlags arg0)
     {
       Contract.Ensures(Contract.Result< ConstructorInfo[]>() != null);
 
-      return default( ConstructorInfo[]);
+      return default(ConstructorInfo[]);
     }
 
     [Pure]
@@ -951,14 +952,14 @@ public virtual ConstructorInfo[] GetConstructors()
       Contract.Ensures(Contract.Result< ConstructorInfo[]>() != null);
       Contract.Ensures(Contract.ForAll(Contract.Result<ConstructorInfo[]>(), el => el != null));
 
-      return default( ConstructorInfo[]);
+      return default(ConstructorInfo[]);
     }
 
     [Pure]
     public virtual ConstructorInfo GetConstructor(Type[] types)
     {
 
-      return default( ConstructorInfo);
+      return default(ConstructorInfo);
     }
 
 #if false

Microsoft.Research/Contracts/System.Core.Contracts/System.Linq.Expressions.Expression.cs

@@ -7666,7 +7666,6 @@ public static NewArrayExpression NewArrayInit(Type type, params Expression[] ini
     {
       Contract.Requires(type != null);
       Contract.Requires(initializers != null);
-      Contract.Requires(initializers.Length >= 1);
       Contract.Ensures(Contract.Result<NewArrayExpression>() != null);
       return default(NewArrayExpression);
     }