System.Design.dll depended on System.Data internals so remove deps.

The old internal types don't exist in new System.Data.dll.

diff --git a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
index 8dd55a5f9bd63e104c2e27971784552a54c63fa3..92a113de719ead7236118c8dc9da427b5ce34f90 100644 (file)
--- a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
+++ b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
@@ -39,6 +39,8 @@ using System.Data.Common;
 using System.Reflection;
 using System.IO;
 
+using T = System.Data.TypedDataSetGenerator;
+
 namespace System.Data.Design
 {
        // It is likely replaced by System.Data.TypedDataSetGenerator-based
@@ -65,26 +67,15 @@ namespace System.Data.Design
 
                public static string Generate (DataSet dataSet, CodeNamespace codeNamespace, CodeDomProvider codeProvider)
                {
-                       // See CustomDataclassGenerator.cs
-                       CustomDataClassGenerator.CreateDataSetClasses (
-                               dataSet, codeNamespace, codeProvider, null);
-
+                       T.Generate (dataSet, codeNamespace, codeProvider.CreateGenerator ());
                        return null;
                }
 
                public static string Generate (string inputFileContent, CodeCompileUnit compileUnit, CodeNamespace mainNamespace, CodeDomProvider codeProvider)
                {
-                       if (inputFileContent == null || inputFileContent.Length < 5)
-                               return null;
-                       
-                       DataSet ds = new DataSet ();
-                       StringReader sr = new StringReader (inputFileContent);
-                       ds.ReadXmlSchema (sr as TextReader);
-                       
-                       // See CustomDataclassGenerator.cs
-                       CustomDataClassGenerator.CreateDataSetClasses (
-                               ds, compileUnit, mainNamespace, codeProvider, null);
-                               
+                       var dataSet = new DataSet ();
+                       dataSet.ReadXmlSchema (inputFileContent);
+                       T.Generate (dataSet, mainNamespace, codeProvider.CreateGenerator ());
                        return null;
                }
 

diff --git a/mcs/class/System.Design/System.Design.dll.sources b/mcs/class/System.Design/System.Design.dll.sources
index 2fc410bf55ca1f307f0018dea2ef0fb05d4d4491..5e09500bdbc5a9f883944f3995fc059ffe2042c4 100755 (executable)
--- a/mcs/class/System.Design/System.Design.dll.sources
+++ b/mcs/class/System.Design/System.Design.dll.sources
@@ -102,6 +102,7 @@ System.ComponentModel.Design.Serialization/StatementContext.cs
 System.ComponentModel.Design.Serialization/TypeCodeDomSerializer.cs
 System.Data.Design/MethodSignatureGenerator.cs
 System.Data.Design/ParameterGenerationOption.cs
+System.Data.Design/TableAdapterSchemaInfo.cs
 System.Data.Design/TypedDataSetGenerator.cs
 System.Data.Design/TypedDataSetGeneratorException.cs
 System.Data.Design/TypedDataSetSchemaImporterExtension.cs