Imported Upstream version 6.0.0.273
Former-commit-id: 9f1a238d9eaeb39fc1234b8e83567c1d4e99faf3
This commit is contained in:
parent
2ba231cd0c
commit
fbb58b904f
@ -1 +1 @@
|
||||
b4f0760a37d6ddf719a54078d952ec1b1e471435
|
||||
abd602ec6c4c11c990007b1aa0b7d5fc396f372f
|
@ -1 +1 @@
|
||||
e11bcccdba2e961d4e81ff05c08677f97826ade0
|
||||
bb257c545bcbabd7cef4a90cfd0c7eb5d2e6066f
|
@ -1 +1 @@
|
||||
4d40b57c3c756e46690a132fe42760103ba01619
|
||||
e1a3482dd9bf1a8d93cbd3aa5d470cfbc6f3ad69
|
@ -41,7 +41,7 @@ static partial class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "6.0.0.271";
|
||||
public const string MonoVersion = "6.0.0.273";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -6,7 +6,7 @@
|
||||
PLATFORM_MCS_FLAGS =
|
||||
PLATFORM_RUNTIME = $(RUNTIME)
|
||||
PLATFORM_CORLIB = mscorlib.dll
|
||||
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac MacNotWorking
|
||||
PLATFORM_TEST_HARNESS_EXCLUDES = NotOnMac
|
||||
|
||||
EXTERNAL_MCS = mcs
|
||||
EXTERNAL_MBAS = mbas
|
||||
|
@ -37,10 +37,8 @@ else
|
||||
MANAGED_INTERP := $(filter orbis winaot monotouch monotouch_tv monotouch_watch, $(PROFILE))
|
||||
ifdef MANAGED_INTERP
|
||||
LIB_MCS_FLAGS += -d:NO_FEATURE_STATIC_DELEGATE,FEATURE_MAKE_RUN_METHODS
|
||||
PROFILE_TEST_HARNESS_EXCLUDES := $(PROFILE_TEST_HARNESS_EXCLUDES) NotWorkingLinqInterpreter
|
||||
else
|
||||
LIB_MCS_FLAGS += -d:FEATURE_COMPILE,FEATURE_COMPILE_TO_METHODBUILDER
|
||||
PROFILE_TEST_HARNESS_EXCLUDES := $(PROFILE_TEST_HARNESS_EXCLUDES) SRE
|
||||
endif
|
||||
endif
|
||||
|
||||
|
@ -26,7 +26,7 @@ namespace MonoTests.System.Web.Services.Description
|
||||
public class ServiceDescriptionTest
|
||||
{
|
||||
[Test]
|
||||
[Category ("MacNotWorking")] // https://bugzilla.xamarin.com/show_bug.cgi?id=51254
|
||||
[Category ("NotOnMac")] // https://bugzilla.xamarin.com/show_bug.cgi?id=51254
|
||||
public void SimpleWrite ()
|
||||
{
|
||||
ServiceDescription sd = new ServiceDescription ();
|
||||
|
@ -59,7 +59,7 @@ public class SslStreamTest {
|
||||
}
|
||||
|
||||
[Test] //bug https://bugzilla.novell.com/show_bug.cgi?id=457120
|
||||
[Category ("MacNotWorking")] // Works but launches a prompt on 10.12 that will fail if you don't click in a few seconds
|
||||
[Category ("NotOnMac")] // Works but launches a prompt on 10.12 that will fail if you don't click in a few seconds
|
||||
[Category ("NotWorking")] // https://github.com/mono/mono/issues/8450
|
||||
#if FEATURE_NO_BSD_SOCKETS
|
||||
[ExpectedException (typeof (PlatformNotSupportedException))]
|
||||
|
@ -582,7 +582,7 @@ mgk3bWUV6ChegutbguiKrI/DbO7wPiDLxw==
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MacNotWorking")] // SecCertificateCreateWithData does different things on 10.11 vs 10.12 with invalid certificates https://bugzilla.xamarin.com/show_bug.cgi?id=53689
|
||||
[Category ("NotOnMac")] // SecCertificateCreateWithData does different things on 10.11 vs 10.12 with invalid certificates https://bugzilla.xamarin.com/show_bug.cgi?id=53689
|
||||
[ExpectedException (typeof (CryptographicException))]
|
||||
public void Pkcs12_1_WithoutPassword ()
|
||||
{
|
||||
@ -597,7 +597,7 @@ mgk3bWUV6ChegutbguiKrI/DbO7wPiDLxw==
|
||||
}
|
||||
|
||||
[Test]
|
||||
[Category ("MacNotWorking")] // SecCertificateCreateWithData does different things on 10.11 vs 10.12 with invalid certificates https://bugzilla.xamarin.com/show_bug.cgi?id=53689
|
||||
[Category ("NotOnMac")] // SecCertificateCreateWithData does different things on 10.11 vs 10.12 with invalid certificates https://bugzilla.xamarin.com/show_bug.cgi?id=53689
|
||||
public void Pkcs12_2_Properties ()
|
||||
{
|
||||
CheckPkcs12 (new X509Certificate (farscape_nopwd_pfx));
|
||||
@ -729,7 +729,7 @@ mgk3bWUV6ChegutbguiKrI/DbO7wPiDLxw==
|
||||
|
||||
[Test]
|
||||
[ExpectedException (typeof (CryptographicException))]
|
||||
[Category ("MacNotWorking")] // SecCertificateCreateWithData does different things on 10.11 vs 10.12 with invalid certificates https://bugzilla.xamarin.com/show_bug.cgi?id=53689
|
||||
[Category ("NotOnMac")] // SecCertificateCreateWithData does different things on 10.11 vs 10.12 with invalid certificates https://bugzilla.xamarin.com/show_bug.cgi?id=53689
|
||||
public void Pkcs7_Ctor ()
|
||||
{
|
||||
new X509Certificate (farscape_pkcs7);
|
||||
|
@ -84,9 +84,7 @@ RESOURCE_FILES = \
|
||||
|
||||
REFERENCE_SOURCES_FLAGS = -d:FEATURE_PAL,GENERICS_WORK,FEATURE_LIST_PREDICATES,FEATURE_SERIALIZATION,FEATURE_ENCODINGNLS,FEATURE_ASCII,FEATURE_LATIN1,FEATURE_UTF7,FEATURE_UTF32,MONO_HYBRID_ENCODING_SUPPORT,FEATURE_ASYNC_IO,NEW_EXPERIMENTAL_ASYNC_IO,FEATURE_UTF32,FEATURE_EXCEPTIONDISPATCHINFO,FEATURE_CORRUPTING_EXCEPTIONS,FEATURE_EXCEPTION_NOTIFICATIONS,FEATURE_STRONGNAME_MIGRATION,FEATURE_USE_LCID,FEATURE_FUSION,FEATURE_CRYPTO,FEATURE_X509_SECURESTRINGS,FEATURE_SYNCHRONIZATIONCONTEXT,FEATURE_SYNCHRONIZATIONCONTEXT_WAIT,HAS_CORLIB_CONTRACTS
|
||||
|
||||
ifdef NO_SRE
|
||||
PROFILE_TEST_HARNESS_EXCLUDES := $(PROFILE_TEST_HARNESS_EXCLUDES) SRE
|
||||
else
|
||||
ifndef NO_SRE
|
||||
LIB_MCS_FLAGS += -d:MONO_FEATURE_SRE
|
||||
endif
|
||||
|
||||
|
@ -48,18 +48,6 @@ namespace System.Reflection.Emit
|
||||
}
|
||||
}
|
||||
|
||||
public override string EscapedCodeBase {
|
||||
get {
|
||||
throw new PlatformNotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
public override System.Security.Policy.Evidence Evidence {
|
||||
get {
|
||||
throw new PlatformNotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
public override string FullName {
|
||||
get {
|
||||
throw new PlatformNotSupportedException ();
|
||||
@ -202,8 +190,6 @@ namespace System.Reflection.Emit
|
||||
public void SetEntryPoint (MethodInfo entryMethod) => throw new PlatformNotSupportedException ();
|
||||
|
||||
public void SetEntryPoint (MethodInfo entryMethod, PEFileKinds fileKind) => throw new PlatformNotSupportedException ();
|
||||
|
||||
public override string ToString () => throw new PlatformNotSupportedException ();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -101,7 +101,7 @@ namespace System.Reflection.Emit
|
||||
public void SetUserEntryPoint(System.Reflection.MethodInfo entryPoint) => throw new PlatformNotSupportedException();
|
||||
}
|
||||
|
||||
public readonly partial struct MethodToken : System.IEquatable<MethodToken>
|
||||
public readonly partial struct MethodToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.MethodToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
@ -112,7 +112,7 @@ namespace System.Reflection.Emit
|
||||
public static bool operator !=(System.Reflection.Emit.MethodToken a, System.Reflection.Emit.MethodToken b) { throw new PlatformNotSupportedException(); }
|
||||
}
|
||||
|
||||
public readonly partial struct SignatureToken : System.IEquatable<SignatureToken>
|
||||
public readonly partial struct SignatureToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.SignatureToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
@ -123,7 +123,7 @@ namespace System.Reflection.Emit
|
||||
public static bool operator !=(System.Reflection.Emit.SignatureToken a, System.Reflection.Emit.SignatureToken b) { throw new PlatformNotSupportedException(); }
|
||||
}
|
||||
|
||||
public readonly partial struct FieldToken : System.IEquatable<FieldToken>
|
||||
public readonly partial struct FieldToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.FieldToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
@ -134,7 +134,7 @@ namespace System.Reflection.Emit
|
||||
public static bool operator !=(System.Reflection.Emit.FieldToken a, System.Reflection.Emit.FieldToken b) { throw new PlatformNotSupportedException(); }
|
||||
}
|
||||
|
||||
public readonly partial struct StringToken : System.IEquatable<StringToken>
|
||||
public readonly partial struct StringToken
|
||||
{
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
public override bool Equals(object obj) { throw new PlatformNotSupportedException(); }
|
||||
@ -144,7 +144,7 @@ namespace System.Reflection.Emit
|
||||
public static bool operator !=(System.Reflection.Emit.StringToken a, System.Reflection.Emit.StringToken b) { throw new PlatformNotSupportedException(); }
|
||||
}
|
||||
|
||||
public readonly partial struct TypeToken : System.IEquatable<TypeToken>
|
||||
public readonly partial struct TypeToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.TypeToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
@ -178,7 +178,7 @@ namespace System.Reflection.Emit
|
||||
public void SetLocalSignature(byte[] localSignature) => throw new PlatformNotSupportedException();
|
||||
}
|
||||
|
||||
public readonly partial struct EventToken : System.IEquatable<EventToken>
|
||||
public readonly partial struct EventToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.EventToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
@ -189,7 +189,7 @@ namespace System.Reflection.Emit
|
||||
public static bool operator !=(System.Reflection.Emit.EventToken a, System.Reflection.Emit.EventToken b) { throw new PlatformNotSupportedException(); }
|
||||
}
|
||||
|
||||
public readonly partial struct ParameterToken : System.IEquatable<ParameterToken>
|
||||
public readonly partial struct ParameterToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.ParameterToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
@ -200,7 +200,7 @@ namespace System.Reflection.Emit
|
||||
public static bool operator !=(System.Reflection.Emit.ParameterToken a, System.Reflection.Emit.ParameterToken b) { throw new PlatformNotSupportedException(); }
|
||||
}
|
||||
|
||||
public readonly partial struct PropertyToken : System.IEquatable<PropertyToken>
|
||||
public readonly partial struct PropertyToken
|
||||
{
|
||||
public static readonly System.Reflection.Emit.PropertyToken Empty;
|
||||
public int Token { get { throw new PlatformNotSupportedException(); } }
|
||||
|
@ -1 +1 @@
|
||||
764f0b5a8e71bad608f33473f5ced1908bb9f7c0
|
||||
b9f8bb4d30e38a546af59047346032840e81339f
|
@ -1 +1 @@
|
||||
908a4eff75b7a87d11f4d068d4da135abec8ff24
|
||||
ab408148e80bab31a6cdbe9e8eca6f4fe91bfd13
|
@ -1 +1 @@
|
||||
9adc22ff8d833e9611de166b80f5d6f9f63a1b92
|
||||
87d67579a4b5e7efb7b0fc156f701c6b1069a68d
|
@ -1 +1 @@
|
||||
265020b8b883f608623d08eb26f1933212c2001c
|
||||
4597b2427800d6bdf5eac5c3233079c70d70df66
|
Binary file not shown.
@ -1 +1 @@
|
||||
1e5bb463cd1e4a5121ca98da10116c1079f75d92
|
||||
4ddea367330ea429dac868174f94d8cca56e0a3e
|
@ -1 +1 @@
|
||||
b02f7d4eba14d2521b57858f0cb62fe118d6951d
|
||||
152f44b38468d1a8dca64db443b5868aac177380
|
@ -1 +1 @@
|
||||
aae338822855eaa679855c58498fda7bdf629c77
|
||||
df9d3de85d2558fcb00bf22a81160678dff93418
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user