Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarek Safar <marek.safar@gmail.com>2017-07-24 21:28:39 +0300
committerMarek Safar <marek.safar@gmail.com>2017-07-25 13:51:52 +0300
commitefc7e54e149d5b4642bc3b89d7d963c98ec84561 (patch)
treecdaabb583ba416978c17056d86f6c1ac2c8f78f7 /mcs/class/Microsoft.CSharp
parent4526bbb722b875f0b1de4df547a3d544b20cd324 (diff)
Bump CoreFX
Diffstat (limited to 'mcs/class/Microsoft.CSharp')
-rw-r--r--mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources4
-rw-r--r--mcs/class/Microsoft.CSharp/corefx/SR.cs15
2 files changed, 1 insertions, 18 deletions
diff --git a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
index c8779956f39..e80529c6534 100644
--- a/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
+++ b/mcs/class/Microsoft.CSharp/Microsoft.CSharp.dll.sources
@@ -64,13 +64,11 @@ corefx/SR.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRExtensions.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ExprFactory.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/EXPRFLAG.cs
-../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FileRecord.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/FundamentalTypes.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GlobalSymbolContext.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinder.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/GroupToArgsBinderResult.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/ImplicitConversion.cs
-../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/InputFile.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/LangCompiler.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookup.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/MemberLookupResults.cs
@@ -141,10 +139,8 @@ corefx/SR.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Return.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Statement.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Temporary.cs
-../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeArguments.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/TypeOf.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnaryOperator.cs
-../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UnboundAnonymousFunction.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedConversion.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/UserDefinedLogicalOperator.cs
../../../external/corefx/src/Microsoft.CSharp/src/Microsoft/CSharp/RuntimeBinder/Semantics/Tree/Visitors/ExpressionTreeRewriter.cs
diff --git a/mcs/class/Microsoft.CSharp/corefx/SR.cs b/mcs/class/Microsoft.CSharp/corefx/SR.cs
index c4b854bfd8f..b0889c45c1d 100644
--- a/mcs/class/Microsoft.CSharp/corefx/SR.cs
+++ b/mcs/class/Microsoft.CSharp/corefx/SR.cs
@@ -12,15 +12,12 @@ partial class SR
public const string BindPropertyFailedMethodGroup = "The name '{0}' is bound to a method and cannot be used like a property";
public const string BindPropertyFailedEvent = "The event '{0}' can only appear on the left hand side of +";
public const string BindInvokeFailedNonDelegate = "Cannot invoke a non-delegate type";
- public const string BindImplicitConversionRequireOneArgument = "Implicit conversion takes exactly one argument";
- public const string BindExplicitConversionRequireOneArgument = "Explicit conversion takes exactly one argument";
public const string BindBinaryAssignmentRequireTwoArguments = "Binary operators cannot be invoked with one argument";
public const string BindBinaryAssignmentFailedNullReference = "Cannot perform member assignment on a null reference";
public const string NullReferenceOnMemberException = "Cannot perform runtime binding on a null reference";
public const string BindCallToConditionalMethod = "Cannot dynamically invoke method '{0}' because it has a Conditional attribute";
public const string BindToVoidMethodButExpectResult = "Cannot implicitly convert type 'void' to 'object'";
public const string BadBinaryOps = "Operator '{0}' cannot be applied to operands of type '{1}' and '{2}'";
- public const string IntDivByZero = "Division by constant zero";
public const string BadIndexLHS = "Cannot apply indexing with [] to an expression of type '{0}'";
public const string BadIndexCount = "Wrong number of indices inside []; expected '{0}'";
public const string BadUnaryOp = "Operator '{0}' cannot be applied to operand of type '{1}'";
@@ -48,19 +45,14 @@ partial class SR
public const string AssgReadonlyProp = "Property or indexer '{0}' cannot be assigned to -- it is read only";
public const string AbstractBaseCall = "Cannot call an abstract base member: '{0}'";
public const string RefProperty = "A property or indexer may not be passed as an out or ref parameter";
- public const string ManagedAddr = "Cannot take the address of, get the size of, or declare a pointer to a managed type ('{0}')";
- public const string FixedNotNeeded = "You cannot use the fixed statement to take the address of an already fixed expression";
public const string UnsafeNeeded = "Dynamic calls cannot be used in conjunction with pointers";
public const string BadBoolOp = "In order to be applicable as a short circuit operator a user-defined logical operator ('{0}') must have the same return type as the type of its 2 parameters";
public const string MustHaveOpTF = "The type ('{0}') must contain declarations of operator true and operator false";
- public const string CheckedOverflow = "The operation overflows at compile time in checked mode";
public const string ConstOutOfRangeChecked = "Constant value '{0}' cannot be converted to a '{1}' (use 'unchecked' syntax to override)";
public const string AmbigMember = "Ambiguity between '{0}' and '{1}'";
public const string SizeofUnsafe = "'{0}' does not have a predefined size, therefore sizeof can only be used in an unsafe context (consider using System.Runtime.InteropServices.Marshal.SizeOf)";
- public const string FieldInitRefNonstatic = "A field initializer cannot reference the non-static field, method, or property '{0}'";
public const string CallingFinalizeDepracated = "Destructors and object.Finalize cannot be called directly. Consider calling IDisposable.Dispose if available.";
public const string CallingBaseFinalizeDeprecated = "Do not directly call your base class Finalize method. It is called automatically from your destructor.";
- public const string BadCastInFixed = "The right hand side of a fixed statement assignment may not be a cast expression";
public const string NoImplicitConvCast = "Cannot implicitly convert type '{0}' to '{1}'. An explicit conversion exists (are you missing a cast?)";
public const string InaccessibleGetter = "The property or indexer '{0}' cannot be used in this context because the get accessor is inaccessible";
public const string InaccessibleSetter = "The property or indexer '{0}' cannot be used in this context because the set accessor is inaccessible";
@@ -80,18 +72,13 @@ partial class SR
public const string MethGrpToNonDel = "Cannot convert method group '{0}' to non-delegate type '{1}'. Did you intend to invoke the method?";
public const string RefConstraintNotSatisfied = "The type '{2}' must be a reference type in order to use it as parameter '{1}' in the generic type or method '{0}'";
public const string ValConstraintNotSatisfied = "The type '{2}' must be a non-nullable value type in order to use it as parameter '{1}' in the generic type or method '{0}'";
- public const string CircularConstraint = "Circular constraint dependency involving '{0}' and '{1}'";
- public const string BaseConstraintConflict = "Type parameter '{0}' inherits conflicting constraints '{1}' and '{2}'";
- public const string ConWithValCon = "Type parameter '{1}' has the 'struct' constraint so '{1}' cannot be used as a constraint for '{0}'";
public const string AmbigUDConv = "Ambiguous user defined conversions '{0}' and '{1}' when converting from '{2}' to '{3}'";
public const string PredefinedTypeNotFound = "Predefined type '{0}' is not defined or imported";
- public const string PredefinedTypeBadType = "Predefined type '{0}' is declared incorrectly";
public const string BindToBogus = "'{0}' is not supported by the language";
public const string CantCallSpecialMethod = "'{0}': cannot explicitly call operator or accessor";
public const string BogusType = "'{0}' is a type not supported by the language";
public const string MissingPredefinedMember = "Missing compiler required member '{0}.{1}'";
public const string LiteralDoubleCast = "Literal of type double cannot be implicitly converted to type '{1}'; use an '{0}' suffix to create a literal of this type";
- public const string UnifyingInterfaceInstantiations = "'{0}' cannot implement both '{1}' and '{2}' because they may unify for some type parameter substitutions";
public const string ConvertToStaticClass = "Cannot convert to static type '{0}'";
public const string GenericArgIsStaticClass = "'{0}': static types cannot be used as type arguments";
public const string PartialMethodToDelegate = "Cannot create delegate from method '{0}' because it is a partial method without an implementing declaration";
@@ -118,7 +105,6 @@ partial class SR
public const string RefReadonlyStatic2 = "Fields of static readonly field '{0}' cannot be passed ref or out (except in a static constructor)";
public const string AssgReadonlyLocalCause = "Cannot assign to '{0}' because it is a '{1}'";
public const string RefReadonlyLocalCause = "Cannot pass '{0}' as a ref or out argument because it is a '{1}'";
- public const string ThisStructNotInAnonMeth = "Anonymous methods, lambda expressions, and query expressions inside structs cannot access instance members of 'this'. Consider copying 'this' to a local variable outside the anonymous method, lambda expression or query expression and using the local instead.";
public const string DelegateOnNullable = "Cannot bind delegate to '{0}' because it is a member of 'System.Nullable<T>'";
public const string BadCtorArgCount = "'{0}' does not contain a constructor that takes '{1}' arguments";
public const string BadExtensionArgTypes = "'{0}' does not contain a definition for '{1}' and the best extension method overload '{2}' has some invalid arguments";
@@ -131,4 +117,5 @@ partial class SR
public const string BadNamedArgumentForDelegateInvoke = "The delegate '{0}' does not have a parameter named '{1}'";
public const string DuplicateNamedArgument = "Named argument '{0}' cannot be specified multiple times";
public const string NamedArgumentUsedInPositional = "Named argument '{0}' specifies a parameter for which a positional argument has already been given";
+ public const string TypeArgumentRequiredForStaticCall = "The first argument to dynamically-bound static call must be a Type";
}