Merge pull request #1624 from esdrubal/getprocesstimes

[mono.git] / mcs / class / System.Design / System.Data.Design / TypedDataSetGenerator.cs

diff --git a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
index e3ab9426890473e76d23c5ee7a0e6f07c2a65e32..92a113de719ead7236118c8dc9da427b5ce34f90 100644 (file)
--- a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
+++ b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
@@ -28,7 +28,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.CodeDom;
 using System.CodeDom.Compiler;
@@ -38,6 +37,9 @@ using System.ComponentModel.Design;
 using System.Data;
 using System.Data.Common;
 using System.Reflection;
+using System.IO;
+
+using T = System.Data.TypedDataSetGenerator;
 
 namespace System.Data.Design
 {
@@ -50,7 +52,6 @@ namespace System.Data.Design
                {
                }
 
-#if NET_3_5
                [Flags]
                public enum GenerateOption
                {
@@ -58,23 +59,24 @@ namespace System.Data.Design
                        HierarchicalUpdate = 1,
                        LinqOverTypedDatasets = 2
                }
-#endif
 
                [MonoTODO]
                public static ICollection<Assembly> ReferencedAssemblies {
                        get { throw new NotImplementedException (); }
                }
 
-               [MonoTODO]
                public static string Generate (DataSet dataSet, CodeNamespace codeNamespace, CodeDomProvider codeProvider)
                {
-                       throw new NotImplementedException ();
+                       T.Generate (dataSet, codeNamespace, codeProvider.CreateGenerator ());
+                       return null;
                }
 
-               [MonoTODO]
                public static string Generate (string inputFileContent, CodeCompileUnit compileUnit, CodeNamespace mainNamespace, CodeDomProvider codeProvider)
                {
-                       throw new NotImplementedException ();
+                       var dataSet = new DataSet ();
+                       dataSet.ReadXmlSchema (inputFileContent);
+                       T.Generate (dataSet, mainNamespace, codeProvider.CreateGenerator ());
+                       return null;
                }
 
                [MonoTODO]
@@ -89,7 +91,6 @@ namespace System.Data.Design
                        throw new NotImplementedException ();
                }
 
-#if NET_3_5
                [MonoTODO]
                public static string Generate (string inputFileContent, CodeCompileUnit compileUnit, CodeNamespace mainNamespace, CodeDomProvider codeProvider, GenerateOption option)
                {
@@ -101,7 +102,6 @@ namespace System.Data.Design
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                [MonoTODO]
                public static string GetProviderName (string inputFileContent)
@@ -117,4 +117,3 @@ namespace System.Data.Design
        }
 }
 
-#endif