* TypedDataSetGenerator.cs: Remove mention of NET_3_5 -- the

enclosed methods are part of 2.0 SP1.
* TypedDataSetSchemaImporterExtension.cs: Likewise.

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

diff --git a/mcs/class/System.Design/System.Data.Design/ChangeLog b/mcs/class/System.Design/System.Data.Design/ChangeLog
index c07c490aa1813c7b37257140f92e6d5bdcbc8ad4..11eebf7061e17b158aabbcda1ff9fb7f47f119af 100644 (file)
--- a/mcs/class/System.Design/System.Data.Design/ChangeLog
+++ b/mcs/class/System.Design/System.Data.Design/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-11  Raja R Harinath  <harinath@hurrynot.org>
+
+       * TypedDataSetGenerator.cs: Remove mention of NET_3_5 -- the
+       enclosed methods are part of 2.0 SP1.
+       * TypedDataSetSchemaImporterExtension.cs: Likewise.
+
 2007-10-09  Atsushi Enomoto  <atsushi@ximian.com>
 
        * TypedDataSetGeneratorException.cs : only 2.0.

diff --git a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
index e3ab9426890473e76d23c5ee7a0e6f07c2a65e32..e75e2614d696b1db09bf1b32728a533151a76966 100644 (file)
--- a/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
+++ b/mcs/class/System.Design/System.Data.Design/TypedDataSetGenerator.cs
@@ -50,7 +50,6 @@ namespace System.Data.Design
                {
                }
 
-#if NET_3_5
                [Flags]
                public enum GenerateOption
                {
@@ -58,7 +57,6 @@ namespace System.Data.Design
                        HierarchicalUpdate = 1,
                        LinqOverTypedDatasets = 2
                }
-#endif
 
                [MonoTODO]
                public static ICollection<Assembly> ReferencedAssemblies {
@@ -89,7 +87,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 +98,6 @@ namespace System.Data.Design
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                [MonoTODO]
                public static string GetProviderName (string inputFileContent)

diff --git a/mcs/class/System.Design/System.Data.Design/TypedDataSetSchemaImporterExtension.cs b/mcs/class/System.Design/System.Data.Design/TypedDataSetSchemaImporterExtension.cs
index 9fd6fbeef2074641d229e39c1dd1ea4d5f2c35f1..48ec83cc52653eeaf3f1b2f602c97b6217dae39f 100644 (file)
--- a/mcs/class/System.Design/System.Data.Design/TypedDataSetSchemaImporterExtension.cs
+++ b/mcs/class/System.Design/System.Data.Design/TypedDataSetSchemaImporterExtension.cs
@@ -48,12 +48,10 @@ namespace System.Data.Design
                        throw new NotImplementedException ();
                }
 
-#if NET_3_5
                protected TypedDataSetSchemaImporterExtension (TypedDataSetGenerator.GenerateOption dataSetGenerateOptions)
                {
                        throw new NotImplementedException ();
                }
-#endif
 
                [MonoTODO]
                public override string ImportSchemaType (XmlSchemaType type, XmlSchemaObject context, XmlSchemas schemas, XmlSchemaImporter importer, CodeCompileUnit compileUnit, CodeNamespace mainNamespace, CodeGenerationOptions options, CodeDomProvider codeProvider)