Serializable only in NET_2_0 and not in NET_1_x

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

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs
index 8a1b560f2121a4782b183a49ce089ae486878975..bd3c6fd3025d7af89864c0efac8d40f92e49c040 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum AppWinStyle : short {\r
                Hide = 0,\r
                NormalFocus = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs
index 137dc3250a259e5f6e9fa6c597e5d1f5058bd067..af6000a0fbff3255d54c26bdb0781b970411eb9d 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum CallType : int {\r
                Method = 1,\r
                Get = 2,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs
index 4ef8e235e9953af9e7a6950c592c4095ad2529ab..296b2354ef178ff79063a0e5d5ec77145a844915 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs
@@ -36,7 +36,9 @@ namespace Microsoft.VisualBasic {
        /// way strings are compared when using functions such as InStr and StrComp. \r
        /// These constants can be used anywhere in your code.\r
        /// </summary>\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum CompareMethod : int {\r
                /// <summary>\r
                /// Performs a binary comparison\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs
index 346584fb688015cc2d75c904db31377f924d110a..cda66fc2e031a7e88454abfec41cca6084e001c7 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs
@@ -35,7 +35,9 @@ namespace Microsoft.VisualBasic {
        /// When you call the DateValue function, you can use the following \r
        /// enumeration members in your code in place of the actual values.\r
        /// </summary>\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum DateFormat : int {\r
                /// <summary>\r
                /// For real numbers, displays a date and time. If the number has no fractional part, displays only a date. If the number has no integer part, displays time only. Date and time display is determined by your computer's regional settings.\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs
index 760eeb6e1318cf63bb552c57e3ae28a9dce5b4a6..5e4ab0294c40705e0cc08e4d3416e581b6d22a81 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum DateInterval : int {\r
                Year = 0,\r
                Quarter = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs
index 69d5b29dd40492e01410a0f5eaff4c5e1ab10fd0..20451049795d881ed03a64e8ce42a5dd317fab8a 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum DueDate : int {\r
                EndOfPeriod = 0,\r
                BegOfPeriod = 1\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs
index b1b686f3e297968dbc6b1589029900af20a92216..4f5254089668b57a1cced23304847ea64694093a 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs
@@ -33,7 +33,9 @@ using System;
 \r
 namespace Microsoft.VisualBasic {\r
        [Flags] \r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum FileAttribute : int {\r
                Normal = 0,\r
                ReadOnly = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs
index c8475b61c5514a4e4550a54a7777f01afb8d26ea..ac81f838f0b7152f5cca159902cef97f45863c57 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum FirstDayOfWeek : int {\r
                System = 0,\r
                Sunday = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs
index 6cf03683ebf7fa8868609d9716fba00af5945d87..0df28527ba27e1c44b4561b719ddfe1baa5b125b 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum FirstWeekOfYear : int {\r
                System = 0,\r
                Jan1 = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs
index 6417c1a46253aeb87dedeb8ec180b3740aeeb7f8..84f7c225c123ee824c8de9442496f75f0ff1decf 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs
@@ -30,8 +30,10 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
-       [System.FlagsAttribute] \r
+       [System.Flags] \r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum MsgBoxStyle : int {\r
                ApplicationModal = 0,\r
                DefaultButton1 = 0,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs
index a21ae7565d119eeebe46c119fe80e56c0beddb5d..4f9da8f48bc8c484468e853f9c730b67c37f11cc 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum OpenAccess : int {\r
                Read = 1,\r
                Write = 2,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs
index ba393c33acf6f7b2c0f93d3951d0a02d2e821aea..a2e3fcdb5bc2887f3bf04211ab6d00620f1be26f 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum OpenMode : int {\r
                Input = 1,\r
                Output = 2,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs
index 7326e27eac5a52c4f70abc7476072c36a43251c8..3ef9d9a323bc2793f6f48a4c44856ed6cede2ed5 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum OpenShare : int {\r
                LockReadWrite = 0,\r
                LockWrite = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs
index 0a408eb42df38ac5cc654198bcd3411f23708847..5bfa58038758ac12de125bceb3df26165dd0fa5a 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs
@@ -34,7 +34,9 @@ namespace Microsoft.VisualBasic {
        /// When you call number-formatting functions, you can use the following enumeration \r
        /// members in your code in place of the actual values.\r
        /// </summary>\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum TriState : int {\r
                False = 0,\r
                UseDefault = -2,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs
index 81a5aec09a47abb92284dab1e484e38f88787949..bd80eae1cbb4928abc70d68bb1683281f33dcaeb 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs
@@ -30,7 +30,9 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 namespace Microsoft.VisualBasic {\r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum VariantType : int {\r
                Empty = 0,\r
                Null = 1,\r

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs
index 83056eec73bfb09e304eb42f51097e445be312c5..ff2f29ad85709a8440117481f594535187cd2a45 100644 (file)
--- a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs
@@ -40,7 +40,9 @@ namespace Microsoft.VisualBasic
        /// members in your code in place of the actual values.\r
        /// </summary>\r
        [System.Flags] \r
+#if NET_2_0
        [System.Serializable]
+#endif
        public enum VbStrConv : int {\r
                /// <summary>\r
                /// Performs no conversion \r