Author: martin
Date: 2005-04-25 01:35:34 -0400 (Mon, 25 Apr 2005)
New Revision: 43529

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/domain.c
   trunk/mono/mono/metadata/metadata.c
   trunk/mono/mono/metadata/reflection.c
   trunk/mono/mono/metadata/row-indexes.h
Log:
2005-04-25  Martin Baulig  <[EMAIL PROTECTED]>

        Upgrade to the latest .NET 2.x beta (Visual Studio 2005 Beta 2).

        * domain.c
        (supported_runtimes): Change "v2.0.40607" -> "v2.0.50215".

        * row-indexes.h (MONO_GENERICPARAM_KIND): Removed.

        * reflection.c (build_compressed_metadata): Set metadata header
        version to 2.0.



Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-04-25 05:34:17 UTC (rev 43528)
+++ trunk/mono/mono/metadata/ChangeLog  2005-04-25 05:35:34 UTC (rev 43529)
@@ -1,3 +1,15 @@
+2005-04-25  Martin Baulig  <[EMAIL PROTECTED]>
+
+       Upgrade to the latest .NET 2.x beta (Visual Studio 2005 Beta 2).
+
+       * domain.c
+       (supported_runtimes): Change "v2.0.40607" -> "v2.0.50215".
+
+       * row-indexes.h (MONO_GENERICPARAM_KIND): Removed.
+
+       * reflection.c (build_compressed_metadata): Set metadata header
+       version to 2.0.
+
 2005-04-23  Zoltan Varga  <[EMAIL PROTECTED]>
 
        * sysmath.c (ves_icall_System_Math_Round2): Use modf to decompose the

Modified: trunk/mono/mono/metadata/domain.c
===================================================================
--- trunk/mono/mono/metadata/domain.c   2005-04-25 05:34:17 UTC (rev 43528)
+++ trunk/mono/mono/metadata/domain.c   2005-04-25 05:35:34 UTC (rev 43529)
@@ -83,7 +83,7 @@
 static const MonoRuntimeInfo supported_runtimes[] = {
        {"v1.0.3705", "1.0", { {1,0,5000,0}, {7,0,5000,0} }     },
        {"v1.1.4322", "1.0", { {1,0,5000,0}, {7,0,5000,0} }     },
-       {"v2.0.40607","2.0", { {2,0,3600,0}, {8,0,3600,0} }     }
+       {"v2.0.50215","2.0", { {2,0,3600,0}, {8,0,3600,0} }     }
 };
 
 

Modified: trunk/mono/mono/metadata/metadata.c
===================================================================
--- trunk/mono/mono/metadata/metadata.c 2005-04-25 05:34:17 UTC (rev 43528)
+++ trunk/mono/mono/metadata/metadata.c 2005-04-25 05:35:34 UTC (rev 43529)
@@ -350,9 +350,6 @@
        MONO_MT_TABLE_IDX,  /* "Owner" },  TypeDef or MethodDef */
        MONO_MT_STRING_IDX, /* "Name" }, */
 
-       /* soon to be removed */
-       MONO_MT_TABLE_IDX,  /* "Kind" },  */
-       
        MONO_MT_END
 };
 

Modified: trunk/mono/mono/metadata/reflection.c
===================================================================
--- trunk/mono/mono/metadata/reflection.c       2005-04-25 05:34:17 UTC (rev 
43528)
+++ trunk/mono/mono/metadata/reflection.c       2005-04-25 05:35:34 UTC (rev 
43529)
@@ -2078,7 +2078,6 @@
        values [MONO_GENERICPARAM_FLAGS] = entry->gparam->attrs;
        values [MONO_GENERICPARAM_NUMBER] = param->num;
        values [MONO_GENERICPARAM_NAME] = string_heap_insert (&assembly->sheap, 
param->name);
-       values [MONO_GENERICPARAM_KIND] = 0;
 
        encode_constraints (entry->gparam, table_idx, assembly);
 }
@@ -3396,10 +3395,10 @@
        p += 4;
 
        if ((assembly->tables [MONO_TABLE_GENERICPARAM].rows > 0) ||
-                       (assembly->tables [MONO_TABLE_METHODSPEC].rows > 0) ||
-                       (assembly->tables 
[MONO_TABLE_GENERICPARAMCONSTRAINT].rows > 0)) {
-               *p++ = 1; /* version */
-               *p++ = 1;
+           (assembly->tables [MONO_TABLE_METHODSPEC].rows > 0) ||
+           (assembly->tables [MONO_TABLE_GENERICPARAMCONSTRAINT].rows > 0)) {
+               *p++ = 2; /* version */
+               *p++ = 0;
        } else {
                *p++ = 1; /* version */
                *p++ = 0;

Modified: trunk/mono/mono/metadata/row-indexes.h
===================================================================
--- trunk/mono/mono/metadata/row-indexes.h      2005-04-25 05:34:17 UTC (rev 
43528)
+++ trunk/mono/mono/metadata/row-indexes.h      2005-04-25 05:35:34 UTC (rev 
43529)
@@ -267,9 +267,6 @@
        MONO_GENERICPARAM_FLAGS,
        MONO_GENERICPARAM_OWNER,
        MONO_GENERICPARAM_NAME,
-
-       /* Next two soon to be gone */
-       MONO_GENERICPARAM_KIND,
        
        MONO_GENERICPARAM_SIZE
 };

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to