Imported Upstream version 4.6.1.3

Former-commit-id: a3e5816ec0030ec68ca623935b6704cc0369f223
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2016-09-28 13:11:46 +00:00
parent a306c5803a
commit b7d1d80bf3
38 changed files with 3749 additions and 245 deletions

View File

@@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "4.6.0.0";
public const string MonoVersion = "4.6.1.0";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

View File

@@ -107,6 +107,7 @@ xammac_4_5_dirs := \
System.ServiceModel.Internals \
SMDiagnostics \
System.Numerics \
System.Numerics.Vectors \
Mono.Data.Tds \
System.Transactions \
System.EnterpriseServices \

View File

@@ -1 +1 @@
3dd17d0c16ba42ad68b52821e4491c8eafe06c04
999ca900d5443337a86927d0d2ef2add4422f2b4

View File

@@ -1 +1 @@
f4586a253f8ce09c2b2178d6f5e08ad53b55445a
7d024238d081e85b535a28cb160e824d94975df7

View File

@@ -1 +1 @@
ad3993fd19839b18ea25f5027adfba1808a9b38e
c083b93e7b6150b680d32a820f3b88c682ddf789

View File

@@ -1 +1 @@
1273821e71f05ca43fbda455ebe7d4c747213ee3
08ca578f5d7e96ee914dfbdbf084f73f3e8909b0

View File

@@ -1 +1 @@
a03412e4144d551461b4f8b21d25f3258a2ec5f1
619913794ad60026c6830bab6dbfd0527c03dcb3

View File

@@ -1 +1 @@
013e06f897446058c505edc676ba7cf78939b671
931b6d3637a95ae8cd8c492c6fa7126cffa90444

View File

@@ -1 +1 @@
c3bbfb8e3d0bb1d4648a456800a8f616d8a28016
e1e9686ed7784f6a16ea693a569012bf15888449

View File

@@ -1 +1 @@
8410f10f87dea9524681b3f688dab2f70afbf9b5
9b7e5806ba59d76556574f901304d48e15f9520f

View File

@@ -1 +1 @@
d2b12594e92c61982d88980ec4bfaeb7c3bdf9ab
48c23282983ab1e14ac9a68999ba56373af61c8d

View File

@@ -109,7 +109,6 @@ namespace Mono.CSharp
var imported = MemberDefinition as ImportedTypeDefinition;
if (imported != null && Kind != MemberKind.MissingType)
imported.DefineInterfaces (this);
}
return ifaces;
@@ -1603,6 +1602,12 @@ namespace Mono.CSharp
public TypeSpec Element { get; private set; }
public override IList<TypeSpec> Interfaces {
set {
throw new NotSupportedException ();
}
}
bool ITypeDefinition.IsComImport {
get {
return false;
@@ -1777,13 +1782,19 @@ namespace Mono.CSharp
readonly int rank;
readonly ModuleContainer module;
private ArrayContainer (ModuleContainer module, TypeSpec element, int rank)
ArrayContainer (ModuleContainer module, TypeSpec element, int rank)
: base (MemberKind.ArrayType, element, null)
{
this.module = module;
this.rank = rank;
}
public override IList<TypeSpec> Interfaces {
get {
return BaseType.Interfaces;
}
}
public int Rank {
get {
return rank;
@@ -1926,7 +1937,6 @@ namespace Mono.CSharp
if (!module.ArrayTypesCache.TryGetValue (key, out ac)) {
ac = new ArrayContainer (module, element, rank);
ac.BaseType = module.Compiler.BuiltinTypes.Array;
ac.Interfaces = ac.BaseType.Interfaces;
module.ArrayTypesCache.Add (key, ac);
}
@@ -1942,11 +1952,17 @@ namespace Mono.CSharp
class ReferenceContainer : ElementTypeSpec
{
private ReferenceContainer (TypeSpec element)
ReferenceContainer (TypeSpec element)
: base (MemberKind.Class, element, null) // TODO: Kind.Class is most likely wrong
{
}
public override IList<TypeSpec> Interfaces {
get {
return null;
}
}
public override MetaType GetMetaInfo ()
{
if (info == null) {
@@ -1977,6 +1993,12 @@ namespace Mono.CSharp
state &= ~StateFlags.CLSCompliant_Undetected;
}
public override IList<TypeSpec> Interfaces {
get {
return null;
}
}
public override MetaType GetMetaInfo ()
{
if (info == null) {