2010-06-21 Jb Evain <jbevain@novell.com>

	* Guid.cs: bring Parse/ParseExact/TryParse/TryParseExact in
	Moonlight as well.

svn path=/trunk/mcs/; revision=159254

diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
index 023ed7823a8c9bf6449611b6c55c41c0ec6de76e..214eb2db3cb70efa784454d1202084a9894aa6c8 100644 (file)
--- a/mcs/class/corlib/System/ChangeLog
+++ b/mcs/class/corlib/System/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-21  Jb Evain  <jbevain@novell.com>
+
+       * Guid.cs: bring Parse/ParseExact/TryParse/TryParseExact in
+       Moonlight as well.
+
 2010-06-21  Jb Evain  <jbevain@novell.com>
 
        * TypeAccessException.cs: TypeAccessException is part of moonlight 4.

diff --git a/mcs/class/corlib/System/Guid.cs b/mcs/class/corlib/System/Guid.cs
index 14acb73c0a6d5aed96d6fbc0d8aba7a9d65d779b..8c25d984c15bb84dddf5d0675c183da0e1018040 100644 (file)
--- a/mcs/class/corlib/System/Guid.cs
+++ b/mcs/class/corlib/System/Guid.cs
@@ -660,7 +660,7 @@ namespace System {
                        return !( a.Equals (b) );
                }
 
-#if NET_4_0
+#if NET_4_0 || MOONLIGHT
                public static Guid Parse (string input)
                {
                        Guid guid;