Introduce new MONO_X509_ALIAS conditional and use it in SslStream.cs.

[mono.git] / mcs / ilasm / parser / ILParser.jay

diff --git a/mcs/ilasm/parser/ILParser.jay b/mcs/ilasm/parser/ILParser.jay
index 7001b0cca0b41111a7d17f8577b085c776ad7cf7..63ddee82bfa286db0e183495ef80d6a93e4d5b90 100644 (file)
--- a/mcs/ilasm/parser/ILParser.jay
+++ b/mcs/ilasm/parser/ILParser.jay
@@ -482,6 +482,7 @@ namespace Mono.ILASM {
 %token K_CHARMAPERROR\r
 %token K_LEGACY\r
 %token K_LIBRARY\r
+%token K_AUTO\r
 \r
 /* end generated */\r
 \r
@@ -3260,6 +3261,7 @@ assemblyref_decl  : D_VER int32 COLON int32 COLON int32 COLON int32
                                 if (codegen.CurrentCustomAttrTarget != null)\r
                                         codegen.CurrentCustomAttrTarget.AddCustomAttribute ((CustomAttr) $1);\r
                           }\r
+            | K_AUTO  /* MS ilasm uses this keyword to lookup the specified assembly in the GAC and embeds its attributes, we just ignore it */\r
                        ;\r
 \r
 exptype_all            : exptype_head OPEN_BRACE exptype_decls CLOSE_BRACE\r