Author: jbevain
Date: 2007-07-27 16:54:55 -0400 (Fri, 27 Jul 2007)
New Revision: 82888
Modified:
trunk/mcs/class/Mono.Cecil/ChangeLog
trunk/mcs/class/Mono.Cecil/Mono.Cecil.Metadata/MetadataWriter.cs
trunk/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyFactory.cs
trunk/mcs/class/Mono.Cecil/Mono.Cecil/StructureReader.cs
trunk/mcs/class/Mono.Cecil/Mono.Cecil/TargetRuntime.cs
Log:
2007-07-27 Jb Evain <[EMAIL PROTECTED]>
* Mono.Cecil/AssemblyFactory.cs
Mono.Cecil/TargetRuntime.cs
Mono.Cecil/StructureReader.cs
Mono.Cecil.Metadata/MetadataWriter.cs:
Add support for the NET_2_1 target runtime.
Modified: trunk/mcs/class/Mono.Cecil/ChangeLog
===================================================================
--- trunk/mcs/class/Mono.Cecil/ChangeLog 2007-07-27 20:41:56 UTC (rev
82887)
+++ trunk/mcs/class/Mono.Cecil/ChangeLog 2007-07-27 20:54:55 UTC (rev
82888)
@@ -1,3 +1,11 @@
+2007-07-27 Jb Evain <[EMAIL PROTECTED]>
+
+ * Mono.Cecil/AssemblyFactory.cs
+ Mono.Cecil/TargetRuntime.cs
+ Mono.Cecil/StructureReader.cs
+ Mono.Cecil.Metadata/MetadataWriter.cs:
+ Add support for the NET_2_1 target runtime.
+
2007-07-23 Raja R Harinath <[EMAIL PROTECTED]>
Fix 'make warnings'.
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyFactory.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyFactory.cs 2007-07-27
20:41:56 UTC (rev 82887)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/AssemblyFactory.cs 2007-07-27
20:54:55 UTC (rev 82888)
@@ -95,8 +95,10 @@
Version corlib = typeof (object).Assembly.GetName
().Version;
if (corlib.Major == 1)
return corlib.Minor == 0 ?
TargetRuntime.NET_1_0 : TargetRuntime.NET_1_1;
- else // if (corlib.Major == 2)
- return TargetRuntime.NET_2_0;
+ else if (corlib.Major == 2 && corlib.Minor == 1)
+ return TargetRuntime.NET_2_1;
+
+ return TargetRuntime.NET_2_0;
}
public static AssemblyDefinition DefineAssembly (string name,
AssemblyKind kind)
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/StructureReader.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/StructureReader.cs 2007-07-27
20:41:56 UTC (rev 82887)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/StructureReader.cs 2007-07-27
20:54:55 UTC (rev 82888)
@@ -95,16 +95,27 @@
asm.MetadataToken = new MetadataToken
(TokenType.Assembly, 1);
m_asmDef = asm;
- switch (m_img.MetadataRoot.Header.Version) {
+ string version = m_img.MetadataRoot.Header.Version;
+
+ switch (version) {
case "v1.0.3705" :
asm.Runtime = TargetRuntime.NET_1_0;
break;
case "v1.1.4322" :
asm.Runtime = TargetRuntime.NET_1_1;
break;
- default :
+ case "v2.0.50727" :
asm.Runtime = TargetRuntime.NET_2_0;
break;
+ case "v2.1.20416" :
+ asm.Runtime = TargetRuntime.NET_2_1;
+ break;
+ default:
+ if (version.StartsWith ("v1"))
+ asm.Runtime = TargetRuntime.NET_1_1;
+ else
+ asm.Runtime = TargetRuntime.NET_2_0;
+ break;
}
if ((m_img.PEFileHeader.Characteristics &
ImageCharacteristics.Dll) != 0)
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil/TargetRuntime.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil/TargetRuntime.cs 2007-07-27
20:41:56 UTC (rev 82887)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil/TargetRuntime.cs 2007-07-27
20:54:55 UTC (rev 82888)
@@ -31,6 +31,7 @@
public enum TargetRuntime {
NET_1_0,
NET_1_1,
- NET_2_0
+ NET_2_0,
+ NET_2_1,
}
}
Modified: trunk/mcs/class/Mono.Cecil/Mono.Cecil.Metadata/MetadataWriter.cs
===================================================================
--- trunk/mcs/class/Mono.Cecil/Mono.Cecil.Metadata/MetadataWriter.cs
2007-07-27 20:41:56 UTC (rev 82887)
+++ trunk/mcs/class/Mono.Cecil/Mono.Cecil.Metadata/MetadataWriter.cs
2007-07-27 20:54:55 UTC (rev 82888)
@@ -348,6 +348,9 @@
case TargetRuntime.NET_2_0 :
m_root.Header.Version = "v2.0.50727";
break;
+ case TargetRuntime.NET_2_1 :
+ m_root.Header.Version = "v2.1.20416";
+ break;
}
m_root.Streams.TablesHeap.Tables.Accept (m_tableWriter);
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches