[bcl] Remove NET_2_0 defines from the class libs. This has been done using: unifdef -t -DNET_2_0 -o <filename> <filename>.

79 files changed, 0 insertions, 300 deletions

diff --git a/mcs/class/I18N/CJK/CP51932.cs b/mcs/class/I18N/CJK/CP51932.cs
index 5a396da754f..9ebb5d30de9 100644
--- a/mcs/class/I18N/CJK/CP51932.cs
+++ b/mcs/class/I18N/CJK/CP51932.cs
@@ -98,26 +98,16 @@ public class CP51932 : MonoEncoding
 
 	public override int GetCharCount (byte [] bytes, int index, int count)
 	{
-#if NET_2_0
 		return new CP51932Decoder ().GetCharCount (
 			bytes, index, count, true);
-#else
-		return new CP51932Decoder ().GetCharCount (
-			bytes, index, count);
-#endif
 	}
 
 	public override int GetChars (
 		byte [] bytes, int byteIndex, int byteCount,
 		char [] chars, int charIndex)
 	{
-#if NET_2_0
 		return new CP51932Decoder ().GetChars (bytes,
 			byteIndex, byteCount, chars, charIndex, true);
-#else
-		return new CP51932Decoder ().GetChars (bytes,
-			byteIndex, byteCount, chars, charIndex);
-#endif
 	}
 
 	// Get the maximum number of bytes needed to encode a
@@ -312,13 +302,9 @@ public class CP51932Encoder : MonoEncoder
 			}
 
 			if (value == 0) {
-#if NET_2_0
 				HandleFallback (
 					chars, ref i, ref charCount,
 					bytes, ref posn, ref byteCount, null);
-#else
-				bytes [posn++] = (byte) '?';
-#endif
 			} else if (value < 0x0100) {
 				bytes [posn++] = (byte) value;
 			} else if ((posn + 1) >= byteLength) {
@@ -468,12 +454,8 @@ public class CP51932Encoder : MonoEncoder
 
 			if (value == 0)
 			{
-#if NET_2_0
 				HandleFallback (chars, ref i, ref charCount,
 					bytes, ref posn, ref byteCount, null);
-#else
-				bytes [posn++] = (byte) '?';
-#endif
 			}
 			else if (value < 0x0100)
 			{
@@ -521,11 +503,7 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
 		return GetCharCount (bytes, index, count, false);
 	}
 
-#if NET_2_0
 	public override
-#else
-	internal
-#endif
 	int GetCharCount (byte [] bytes, int index, int count, bool refresh)
 	{
 		CheckRange (bytes, index, count);
@@ -629,11 +607,7 @@ internal class CP51932Decoder : DbcsEncoding.DbcsDecoder
 		return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
 	}
 
-#if NET_2_0
 	public override
-#else
-	internal
-#endif
 	int GetChars (byte[] bytes, int byteIndex,
 						 int byteCount, char[] chars,
 						 int charIndex, bool refresh)
diff --git a/mcs/class/I18N/CJK/CP932.cs b/mcs/class/I18N/CJK/CP932.cs
index 65b86d05c16..cbb65741c76 100644
--- a/mcs/class/I18N/CJK/CP932.cs
+++ b/mcs/class/I18N/CJK/CP932.cs
@@ -130,9 +130,7 @@ namespace I18N.CJK
 		{
 			int charIndex = 0;
 			int byteIndex = 0;
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 
 			// Convert the characters into their byte form.
 			int posn = byteIndex;
@@ -243,14 +241,9 @@ namespace I18N.CJK
 					}
 					else
 					{
-#if NET_2_0
 						HandleFallback (ref buffer,
 							chars, ref charIndex, ref charCount,
 							bytes, ref posn, ref byteCount, null);
-#else
-						// Invalid character.
-						bytes[posn++] = (byte)'?';
-#endif
 					}
 					continue;
 				}
@@ -295,13 +288,9 @@ namespace I18N.CJK
 				}
 				if(value == 0)
 				{
-#if NET_2_0
 					HandleFallback (ref buffer,
 						chars, ref charIndex, ref charCount,
 						bytes, ref posn, ref byteCount, null);
-#else
-					bytes[posn++] = (byte)'?';
-#endif
 				}
 				else if(value < 0x0100)
 				{
@@ -424,9 +413,7 @@ namespace I18N.CJK
 		public override int GetBytes(char[] chars, int charIndex, int charCount, byte[] bytes, int byteIndex)
 		{
 			int byteCount = bytes.Length;
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 
 			// Convert the characters into their byte form.
 			int posn = byteIndex;
@@ -533,13 +520,8 @@ namespace I18N.CJK
 					}
 					else
 					{
-#if NET_2_0
 						HandleFallback (ref buffer, chars, ref i, ref charCount, bytes, 
 							ref byteIndex, ref byteCount, null);
-#else
-						// Invalid character.
-						bytes[posn++] = (byte)'?';
-#endif
 					}
 					continue;
 				}
@@ -584,12 +566,8 @@ namespace I18N.CJK
 				}
 				if (value == 0)
 				{
-#if NET_2_0
 					HandleFallback (ref buffer, chars, ref charIndex, ref charCount,
 						bytes, ref posn, ref byteCount, null);
-#else
-					bytes[posn++] = (byte)'?';
-#endif
 				}
 				else if (value < 0x0100)
 				{
@@ -762,9 +740,7 @@ namespace I18N.CJK
 		}
 
 		public
-#if NET_2_0
 		override
-#endif
 		int GetCharCount (byte [] bytes, int index, int count, bool refresh)
 		{
 			CheckRange (bytes, index, count);
@@ -814,9 +790,7 @@ namespace I18N.CJK
 		}
 
 		public
-#if NET_2_0
 		override
-#endif
 		int GetChars (
 			byte [] bytes, int byteIndex, int byteCount,
 			char [] chars, int charIndex, bool refresh)
diff --git a/mcs/class/I18N/CJK/CP936.cs b/mcs/class/I18N/CJK/CP936.cs
index 2eb40a6ad29..c341d17dc3d 100644
--- a/mcs/class/I18N/CJK/CP936.cs
+++ b/mcs/class/I18N/CJK/CP936.cs
@@ -42,9 +42,7 @@ namespace I18N.CJK
 			int charIndex = 0;
 			int byteIndex = 0;
 			int end = charCount;
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 
 			int origIndex = byteIndex;
 			for (int i = charIndex; i < end; i++, charCount--) {
@@ -57,14 +55,9 @@ namespace I18N.CJK
 				byte b1 = gb2312.u2n[((int)c) * 2 + 1];
 				byte b2 = gb2312.u2n[((int)c) * 2];
 				if (b1 == 0 && b2 == 0) {
-#if NET_2_0
 					HandleFallback (ref buffer, chars,
 						ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, null);
-#else
-					int offset = byteIndex++;
-					if (bytes != null) bytes[offset] = (byte)'?';
-#endif
 				} else {
 					if (bytes != null)
 					{
@@ -87,9 +80,7 @@ namespace I18N.CJK
 			int byteCount = bytes != null ? bytes.Length : 0;
 
 			DbcsConvert gb2312 = GetConvert();
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 			for (int i = charIndex; i < end; i++, charCount--)
 			{
 				char c = chars[i];
@@ -103,13 +94,8 @@ namespace I18N.CJK
 				byte b2 = gb2312.u2n[((int)c) * 2];
 				if (b1 == 0 && b2 == 0)
 				{
-#if NET_2_0
 					HandleFallback (ref buffer, chars, ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, null);
-#else
-					int offset = byteIndex++;
-					if (bytes != null) bytes[] = (byte)'?';
-#endif
 				}
 				else
 				{
@@ -225,9 +211,7 @@ namespace I18N.CJK
 			return GetCharCount (bytes, index, count, false);
 		}
 
-#if NET_2_0
 		public override
-#endif
 		int GetCharCount (byte [] bytes, int index, int count, bool refresh)
 		{
 			CheckRange (bytes, index, count);
@@ -268,9 +252,7 @@ namespace I18N.CJK
 			return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
 		}
 
-#if NET_2_0
 		public override
-#endif
 		int GetChars (byte [] bytes, int byteIndex, int byteCount,
 			      char [] chars, int charIndex, bool refresh)
 		{
diff --git a/mcs/class/I18N/CJK/CP949.cs b/mcs/class/I18N/CJK/CP949.cs
index 0d16d22ceed..0b0ab4975a3 100644
--- a/mcs/class/I18N/CJK/CP949.cs
+++ b/mcs/class/I18N/CJK/CP949.cs
@@ -136,12 +136,8 @@ namespace I18N.CJK
                 byte b1 = convert.u2n[((int)c) * 2];
                 byte b2 = convert.u2n[((int)c) * 2 + 1];
                 if (b1 == 0 && b2 == 0) {
-#if NET_2_0
                     // FIXME: handle fallback for GetByteCountImpl().
                     length++;
-#else
-                    length++;
-#endif
                 }
                 else
                     length += 2;
@@ -157,9 +153,7 @@ namespace I18N.CJK
             int byteIndex = 0;
 			int end = charCount;
             DbcsConvert convert = GetConvert ();
-#if NET_2_0
             EncoderFallbackBuffer buffer = null;
-#endif
 
             // 00 00 - FF FF
             int origIndex = byteIndex;
@@ -172,12 +166,8 @@ namespace I18N.CJK
                 byte b1 = convert.u2n[((int)c) * 2];
                 byte b2 = convert.u2n[((int)c) * 2 + 1];
                 if (b1 == 0 && b2 == 0) {
-#if NET_2_0
                     HandleFallback (ref buffer, chars, ref i, ref charCount,
                         bytes, ref byteIndex, ref byteCount, null);
-#else
-                    bytes[byteIndex++] = (byte)'?';
-#endif
                 } else {
                     bytes[byteIndex++] = b1;
                     bytes[byteIndex++] = b2;
@@ -205,12 +195,8 @@ namespace I18N.CJK
 				byte b2 = convert.u2n[((int)c) * 2 + 1];
 				if (b1 == 0 && b2 == 0)
 				{
-#if NET_2_0
 					// FIXME: handle fallback for GetByteCountImpl().
 					length++;
-#else
-                    length++;
-#endif
 				}
 				else
 					length += 2;
@@ -225,9 +211,7 @@ namespace I18N.CJK
 			int end = charIndex + charCount;
 
 			DbcsConvert convert = GetConvert();
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 
 			// 00 00 - FF FF
 			int origIndex = byteIndex;
@@ -243,12 +227,8 @@ namespace I18N.CJK
 				byte b2 = convert.u2n[((int)c) * 2 + 1];
 				if (b1 == 0 && b2 == 0)
 				{
-#if NET_2_0
 					HandleFallback (ref buffer, chars, ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, null);
-#else
-                    bytes[byteIndex++] = (byte)'?';
-#endif
 				}
 				else
 				{
@@ -295,9 +275,7 @@ namespace I18N.CJK
                 return GetCharCount (bytes, index, count, false);
             }
 
-#if NET_2_0
             public override
-#endif
             int GetCharCount (byte [] bytes, int index, int count, bool refresh)
             {
                 CheckRange (bytes, index, count);
@@ -387,9 +365,7 @@ namespace I18N.CJK
                 return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
             }
 
-#if NET_2_0
             public override
-#endif
             int GetChars(byte[] bytes, int byteIndex,
                                 int byteCount, char[] chars, int charIndex, bool refresh)
             {
diff --git a/mcs/class/I18N/CJK/CP950.cs b/mcs/class/I18N/CJK/CP950.cs
index c10d87ec70f..8e2420ca14c 100644
--- a/mcs/class/I18N/CJK/CP950.cs
+++ b/mcs/class/I18N/CJK/CP950.cs
@@ -44,12 +44,8 @@ namespace I18N.CJK
 				byte b1 = convert.u2n[((int)c) * 2 + 1];
 				byte b2 = convert.u2n[((int)c) * 2];
 				if (b1 == 0 && b2 == 0) {
-#if NET_2_0
 					// FIXME: handle fallback for GetByteCountImpl().
 					length++;
-#else
-					length++;
-#endif
 				}
 				else
 					length += 2;
@@ -65,9 +61,7 @@ namespace I18N.CJK
 			int charIndex = 0;
 			int byteIndex = 0;
 			int end = charCount;
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 
 			int origIndex = byteIndex;
 			for (int i = charIndex; i < end; i++, charCount--) 
@@ -80,13 +74,9 @@ namespace I18N.CJK
 				byte b1 = convert.u2n[((int)c) * 2 + 1];
 				byte b2 = convert.u2n[((int)c) * 2];
 				if (b1 == 0 && b2 == 0) {
-#if NET_2_0
 					HandleFallback (ref buffer, chars,
 						ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, null);
-#else
-					bytes[byteIndex++] = (byte)'?';
-#endif
 				} else {
 					bytes[byteIndex++] = b1;
 					bytes[byteIndex++] = b2;
@@ -113,12 +103,8 @@ namespace I18N.CJK
 				byte b2 = convert.u2n[((int)c) * 2];
 				if (b1 == 0 && b2 == 0)
 				{
-#if NET_2_0
 					// FIXME: handle fallback for GetByteCountImpl().
 					length++;
-#else
-					length++;
-#endif
 				}
 				else
 					length += 2;
@@ -133,9 +119,7 @@ namespace I18N.CJK
 			int end = charIndex + charCount;
 
 			DbcsConvert convert = GetConvert();
-#if NET_2_0
 			EncoderFallbackBuffer buffer = null;
-#endif
 
 			int origIndex = byteIndex;
 			for (int i = charIndex; i < end; i++, charCount--)
@@ -150,12 +134,8 @@ namespace I18N.CJK
 				byte b2 = convert.u2n[((int)c) * 2];
 				if (b1 == 0 && b2 == 0)
 				{
-#if NET_2_0
 					HandleFallback (ref buffer, chars, ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, null);
-#else
-					bytes[byteIndex++] = (byte)'?';
-#endif
 				}
 				else
 				{
@@ -259,9 +239,7 @@ namespace I18N.CJK
 				return GetCharCount (bytes, index, count, false);
 			}
 
-#if NET_2_0
 			public override
-#endif
 			int GetCharCount (byte[] bytes, int index, int count, bool refresh)
 			{
 				CheckRange (bytes, index, count);
@@ -311,9 +289,7 @@ namespace I18N.CJK
 				return GetChars (bytes, byteIndex, byteCount, chars, charIndex, false);
 			}
 
-#if NET_2_0
 			public override
-#endif
 			int GetChars(byte[] bytes, int byteIndex, int byteCount,
 						     char[] chars, int charIndex, bool refresh)
 			{
diff --git a/mcs/class/I18N/CJK/GB18030Encoding.cs b/mcs/class/I18N/CJK/GB18030Encoding.cs
index 957b72c63e2..f62121e81f0 100644
--- a/mcs/class/I18N/CJK/GB18030Encoding.cs
+++ b/mcs/class/I18N/CJK/GB18030Encoding.cs
@@ -384,13 +384,9 @@ namespace I18N.CJK
 					char ch2 = chars [charIndex++];
 					if (!Char.IsSurrogate (ch2)) {
 						// invalid surrogate
-#if NET_2_0
 						HandleFallback (
 							chars, ref charIndex, ref charCount,
 							bytes, ref byteIndex, ref byteCount, null);
-#else
-						bytes [byteIndex++] = (byte) '?';
-#endif
 						continue;
 					}
 					int cp = (ch - 0xD800) * 0x400 + ch2 - 0xDC00;
@@ -533,12 +529,8 @@ namespace I18N.CJK
 					if (!Char.IsSurrogate(ch2))
 					{
 						// invalid surrogate
-#if NET_2_0
 						HandleFallback (chars, ref charIndex, ref charCount,
 							bytes, ref byteIndex, ref byteCount, null);
-#else
-						bytes [byteIndex++] = (byte) '?';
-#endif
 						continue;
 					}
 					int cp = (ch - 0xD800) * 0x400 + ch2 - 0xDC00;
diff --git a/mcs/class/I18N/CJK/ISO2022JP.cs b/mcs/class/I18N/CJK/ISO2022JP.cs
index cd79fad402b..753b2a36b14 100644
--- a/mcs/class/I18N/CJK/ISO2022JP.cs
+++ b/mcs/class/I18N/CJK/ISO2022JP.cs
@@ -379,11 +379,9 @@ namespace I18N.CJK
 					SwitchMode (bytes, ref byteIndex, ref byteCount, ref m, ISO2022JPMode.ASCII);
 					value = (int) ch;
 				} else {
-#if NET_2_0
 					HandleFallback (
 						chars, ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, this);
-#endif
 					// skip non-convertible character
 					continue;
 				}
@@ -525,10 +523,8 @@ namespace I18N.CJK
 				}
 				else
 				{
-#if NET_2_0
 					HandleFallback (chars, ref i, ref charCount,
 						bytes, ref byteIndex, ref byteCount, this);
-#endif
 					// skip non-convertible character
 					continue;
 				}
@@ -578,13 +574,11 @@ namespace I18N.CJK
 		}
 #endif
 
-#if NET_2_0
 		public override void Reset ()
 		{
 			m = ISO2022JPMode.ASCII;
 			shifted_in_conv = shifted_in_count = false;
 		}
-#endif
 	}
 
 
@@ -747,13 +741,11 @@ namespace I18N.CJK
 			return charIndex - start;
 		}
 
-#if NET_2_0
 		public override void Reset ()
 		{
 			m = ISO2022JPMode.ASCII;
 			shifted_in_count = shifted_in_conv = false;
 		}
-#endif
 	}
 
 	[Serializable]
diff --git a/mcs/class/I18N/Common/ByteEncoding.cs b/mcs/class/I18N/Common/ByteEncoding.cs
index baebe23fc2e..67b5a326a76 100644
--- a/mcs/class/I18N/Common/ByteEncoding.cs
+++ b/mcs/class/I18N/Common/ByteEncoding.cs
@@ -48,11 +48,9 @@ public abstract class ByteEncoding : MonoEncoding
 	protected bool isMailNewsDisplay;
 	protected bool isMailNewsSave;
 	protected int windowsCodePage;
-#if NET_2_0
 	static byte [] isNormalized;
 	static byte [] isNormalizedComputed;
 	static byte [] normalization_bytes;
-#endif
 
 	// Constructor.
 	protected ByteEncoding(int codePage, char[] toChars,
@@ -78,7 +76,6 @@ public abstract class ByteEncoding : MonoEncoding
 				this.windowsCodePage = windowsCodePage;
 			}
 
-#if NET_2_0
 	public override bool IsAlwaysNormalized (NormalizationForm form)
 	{
 		if (form != NormalizationForm.FormC)
@@ -114,7 +111,6 @@ public abstract class ByteEncoding : MonoEncoding
 	public override bool IsSingleByte {
 		get { return true; }
 	}
-#endif
 
 	public override int GetByteCount(String s)
 			{
diff --git a/mcs/class/I18N/Common/ByteSafeEncoding.cs b/mcs/class/I18N/Common/ByteSafeEncoding.cs
index 517734581ea..97216cab9f5 100644
--- a/mcs/class/I18N/Common/ByteSafeEncoding.cs
+++ b/mcs/class/I18N/Common/ByteSafeEncoding.cs
@@ -51,11 +51,9 @@ public abstract class ByteSafeEncoding : MonoSafeEncoding
 	protected bool isMailNewsDisplay;
 	protected bool isMailNewsSave;
 	protected int windowsCodePage;
-#if NET_2_0
 	static byte [] isNormalized;
 	static byte [] isNormalizedComputed;
 	static byte [] normalization_bytes;
-#endif
 
 	// Constructor.
 	protected ByteSafeEncoding(int codePage, char[] toChars,
@@ -81,7 +79,6 @@ public abstract class ByteSafeEncoding : MonoSafeEncoding
 				this.windowsCodePage = windowsCodePage;
 			}
 
-#if NET_2_0
 	public override bool IsAlwaysNormalized (NormalizationForm form)
 	{
 		if (form != NormalizationForm.FormC)
@@ -117,7 +114,6 @@ public abstract class ByteSafeEncoding : MonoSafeEncoding
 	public override bool IsSingleByte {
 		get { return true; }
 	}
-#endif
 
 	public override int GetByteCount(String s)
 	{
diff --git a/mcs/class/I18N/Common/MonoEncoding.cs b/mcs/class/I18N/Common/MonoEncoding.cs
index 6807fc05d38..e891cd12c5d 100644
--- a/mcs/class/I18N/Common/MonoEncoding.cs
+++ b/mcs/class/I18N/Common/MonoEncoding.cs
@@ -32,7 +32,6 @@ namespace I18N.Common
 			get { return win_code_page != 0 ? win_code_page : base.WindowsCodePage; }
 		}
 
-#if NET_2_0
 		/// <summary>
 		/// GetBytes method used internally by state-full encoders/encodings.
 		/// </summary>
@@ -90,7 +89,6 @@ namespace I18N.Common
 			HandleFallback(ref buffer, chars, ref charIndex, ref charCount,
 				bytes, ref byteIndex, ref byteCount, null);
 		}
-#endif
 
 		// Get the bytes that result from encoding a character buffer.
 		public override int GetByteCount (
@@ -193,7 +191,6 @@ namespace I18N.Common
 			}
 		}
 
-#if NET_2_0
 		public unsafe override int GetByteCount (char* chars, int count)
 
 		{
@@ -206,7 +203,6 @@ namespace I18N.Common
 		{
 			return GetBytesImpl (chars, charCount, bytes, byteCount);
 		}
-#endif
 
 		//[CLSCompliant (false)]
 		public unsafe abstract int GetByteCountImpl (char* chars, int charCount);
@@ -218,15 +214,11 @@ namespace I18N.Common
 
 		public abstract class MonoEncoder : Encoder
 		{
-#if NET_2_0
 			MonoEncoding encoding;
-#endif
 
 			public MonoEncoder (MonoEncoding encoding)
 			{
-#if NET_2_0
 				this.encoding = encoding;
-#endif
 			}
 
 			public override int GetByteCount (
@@ -289,7 +281,6 @@ namespace I18N.Common
 
 			public unsafe abstract int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount, bool refresh);
 
-		#if NET_2_0
 			public unsafe override int GetBytes (char* chars, int charCount, byte* bytes, int byteCount, bool flush)
 			{
 				return GetBytesImpl (chars, charCount, bytes, byteCount, flush);
@@ -312,6 +303,5 @@ namespace I18N.Common
 				HandleFallback(chars, ref charIndex, ref charCount,
 					bytes, ref byteIndex, ref byteCount, null);
 			}*/
-		#endif
 		}
 }
diff --git a/mcs/class/I18N/Common/MonoSafeEncoding.cs b/mcs/class/I18N/Common/MonoSafeEncoding.cs
index c7caf0f39dd..fdb0870c4a6 100644
--- a/mcs/class/I18N/Common/MonoSafeEncoding.cs
+++ b/mcs/class/I18N/Common/MonoSafeEncoding.cs
@@ -87,15 +87,11 @@ namespace I18N.Common
 
 		public abstract class MonoSafeEncoder : Encoder
 		{
-#if NET_2_0
 			MonoSafeEncoding encoding;
-#endif
 
 			public MonoSafeEncoder (MonoSafeEncoding encoding)
 			{
-#if NET_2_0
 				this.encoding = encoding;
-#endif
 			}
 
 			public void HandleFallback(
diff --git a/mcs/class/I18N/MidEast/CP1254.cs b/mcs/class/I18N/MidEast/CP1254.cs
index 47184ed3d00..f0bd209d7ab 100644
--- a/mcs/class/I18N/MidEast/CP1254.cs
+++ b/mcs/class/I18N/MidEast/CP1254.cs
@@ -140,9 +140,7 @@ public class CP1254 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/MidEast/CP1255.cs b/mcs/class/I18N/MidEast/CP1255.cs
index afe51e63298..cfa3ddef7c6 100644
--- a/mcs/class/I18N/MidEast/CP1255.cs
+++ b/mcs/class/I18N/MidEast/CP1255.cs
@@ -140,9 +140,7 @@ public class CP1255 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/MidEast/CP1256.cs b/mcs/class/I18N/MidEast/CP1256.cs
index e712919f5ba..81ec16e8e74 100644
--- a/mcs/class/I18N/MidEast/CP1256.cs
+++ b/mcs/class/I18N/MidEast/CP1256.cs
@@ -140,9 +140,7 @@ public class CP1256 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/MidEast/CP28596.cs b/mcs/class/I18N/MidEast/CP28596.cs
index 175d518b05b..7eee05bdd75 100644
--- a/mcs/class/I18N/MidEast/CP28596.cs
+++ b/mcs/class/I18N/MidEast/CP28596.cs
@@ -140,9 +140,7 @@ public class CP28596 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/MidEast/CP28598.cs b/mcs/class/I18N/MidEast/CP28598.cs
index a08abbcad00..be28a0dd967 100644
--- a/mcs/class/I18N/MidEast/CP28598.cs
+++ b/mcs/class/I18N/MidEast/CP28598.cs
@@ -140,9 +140,7 @@ public class CP28598 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/MidEast/CP28599.cs b/mcs/class/I18N/MidEast/CP28599.cs
index b9b3ee44f9a..7b5a91b0810 100644
--- a/mcs/class/I18N/MidEast/CP28599.cs
+++ b/mcs/class/I18N/MidEast/CP28599.cs
@@ -140,9 +140,7 @@ public class CP28599 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/MidEast/CP38598.cs b/mcs/class/I18N/MidEast/CP38598.cs
index 2963b3a6113..42bcbf95f87 100644
--- a/mcs/class/I18N/MidEast/CP38598.cs
+++ b/mcs/class/I18N/MidEast/CP38598.cs
@@ -140,9 +140,7 @@ public class CP38598 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP1251.cs b/mcs/class/I18N/Other/CP1251.cs
index c0e4ca355ad..34283c29344 100644
--- a/mcs/class/I18N/Other/CP1251.cs
+++ b/mcs/class/I18N/Other/CP1251.cs
@@ -140,9 +140,7 @@ public class CP1251 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP1257.cs b/mcs/class/I18N/Other/CP1257.cs
index 3c1ff9cba7b..2c12ebc618e 100644
--- a/mcs/class/I18N/Other/CP1257.cs
+++ b/mcs/class/I18N/Other/CP1257.cs
@@ -140,9 +140,7 @@ public class CP1257 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP1258.cs b/mcs/class/I18N/Other/CP1258.cs
index ddbc447f6fc..e56c4673314 100644
--- a/mcs/class/I18N/Other/CP1258.cs
+++ b/mcs/class/I18N/Other/CP1258.cs
@@ -140,9 +140,7 @@ public class CP1258 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP20866.cs b/mcs/class/I18N/Other/CP20866.cs
index fd2cbd0ddcf..c34f861c618 100644
--- a/mcs/class/I18N/Other/CP20866.cs
+++ b/mcs/class/I18N/Other/CP20866.cs
@@ -140,9 +140,7 @@ public class CP20866 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP21866.cs b/mcs/class/I18N/Other/CP21866.cs
index 21a10034bd1..6346494f201 100644
--- a/mcs/class/I18N/Other/CP21866.cs
+++ b/mcs/class/I18N/Other/CP21866.cs
@@ -140,9 +140,7 @@ public class CP21866 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP28594.cs b/mcs/class/I18N/Other/CP28594.cs
index ec50370a21f..efda54f32bd 100644
--- a/mcs/class/I18N/Other/CP28594.cs
+++ b/mcs/class/I18N/Other/CP28594.cs
@@ -140,9 +140,7 @@ public class CP28594 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP28595.cs b/mcs/class/I18N/Other/CP28595.cs
index a959f860e21..296b0b2cc05 100644
--- a/mcs/class/I18N/Other/CP28595.cs
+++ b/mcs/class/I18N/Other/CP28595.cs
@@ -140,9 +140,7 @@ public class CP28595 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Other/CP57002.cs b/mcs/class/I18N/Other/CP57002.cs
index 22c0ed87932..ca3eabf6b63 100644
--- a/mcs/class/I18N/Other/CP57002.cs
+++ b/mcs/class/I18N/Other/CP57002.cs
@@ -89,7 +89,6 @@ public abstract class ISCIIEncoding : MonoEncoding
 
 			public unsafe override int GetByteCountImpl (char* chars, int count)
 			{
-#if NET_2_0
 				int index = 0;
 				int length = 0;
 				char ch;
@@ -124,16 +123,11 @@ public abstract class ISCIIEncoding : MonoEncoding
 
 				// Return the final length of the output.
 				return length;
-#else
-				return count;
-#endif
 			}
 
 	public unsafe override int GetBytesImpl (char* chars, int charCount, byte* bytes, int byteCount)
 			{
-#if NET_2_0
 				EncoderFallbackBuffer buffer = null;
-#endif
 				//int charIndex = 0;
 				int byteIndex = 0;
 				int end = charCount;
@@ -173,12 +167,8 @@ public abstract class ISCIIEncoding : MonoEncoding
 					}
 					else
 					{
-#if NET_2_0
 						HandleFallback (ref buffer, chars, ref i, ref charCount, bytes, ref posn, ref byteCount);
 						continue;
-#else
-						bytes[posn++] = (byte)'?';
-#endif
 					}
 					byteCount--;
 				}
diff --git a/mcs/class/I18N/Other/CP874.cs b/mcs/class/I18N/Other/CP874.cs
index 63d74cfffc9..59c12a277f6 100644
--- a/mcs/class/I18N/Other/CP874.cs
+++ b/mcs/class/I18N/Other/CP874.cs
@@ -140,9 +140,7 @@ public class CP874 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1026.cs b/mcs/class/I18N/Rare/CP1026.cs
index a9a90feb6d7..06585912f66 100644
--- a/mcs/class/I18N/Rare/CP1026.cs
+++ b/mcs/class/I18N/Rare/CP1026.cs
@@ -140,9 +140,7 @@ public class CP1026 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1047.cs b/mcs/class/I18N/Rare/CP1047.cs
index 8c64055fc7b..1bd527ab6f5 100644
--- a/mcs/class/I18N/Rare/CP1047.cs
+++ b/mcs/class/I18N/Rare/CP1047.cs
@@ -140,9 +140,7 @@ public class CP1047 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1140.cs b/mcs/class/I18N/Rare/CP1140.cs
index 72f5b0a27a6..34f9280929a 100644
--- a/mcs/class/I18N/Rare/CP1140.cs
+++ b/mcs/class/I18N/Rare/CP1140.cs
@@ -140,9 +140,7 @@ public class CP1140 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1141.cs b/mcs/class/I18N/Rare/CP1141.cs
index daec8c4e279..f9649fc294e 100644
--- a/mcs/class/I18N/Rare/CP1141.cs
+++ b/mcs/class/I18N/Rare/CP1141.cs
@@ -140,9 +140,7 @@ public class CP1141 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1142.cs b/mcs/class/I18N/Rare/CP1142.cs
index b82fd5cd12d..942750da9f7 100644
--- a/mcs/class/I18N/Rare/CP1142.cs
+++ b/mcs/class/I18N/Rare/CP1142.cs
@@ -140,9 +140,7 @@ public class CP1142 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1143.cs b/mcs/class/I18N/Rare/CP1143.cs
index 01bd42b7c59..0b63f3f9f54 100644
--- a/mcs/class/I18N/Rare/CP1143.cs
+++ b/mcs/class/I18N/Rare/CP1143.cs
@@ -140,9 +140,7 @@ public class CP1143 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1144.cs b/mcs/class/I18N/Rare/CP1144.cs
index 9b36ab5ebac..b09017f2604 100644
--- a/mcs/class/I18N/Rare/CP1144.cs
+++ b/mcs/class/I18N/Rare/CP1144.cs
@@ -140,9 +140,7 @@ public class CP1144 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1145.cs b/mcs/class/I18N/Rare/CP1145.cs
index 1b5e04c38fb..ddd8dfd299a 100644
--- a/mcs/class/I18N/Rare/CP1145.cs
+++ b/mcs/class/I18N/Rare/CP1145.cs
@@ -140,9 +140,7 @@ public class CP1145 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1146.cs b/mcs/class/I18N/Rare/CP1146.cs
index eeadeb4629e..d78a8e5c380 100644
--- a/mcs/class/I18N/Rare/CP1146.cs
+++ b/mcs/class/I18N/Rare/CP1146.cs
@@ -140,9 +140,7 @@ public class CP1146 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1147.cs b/mcs/class/I18N/Rare/CP1147.cs
index e949c8fe4ff..8c41518e08c 100644
--- a/mcs/class/I18N/Rare/CP1147.cs
+++ b/mcs/class/I18N/Rare/CP1147.cs
@@ -140,9 +140,7 @@ public class CP1147 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1148.cs b/mcs/class/I18N/Rare/CP1148.cs
index 0b9e6dec57e..89e1b2ccb7e 100644
--- a/mcs/class/I18N/Rare/CP1148.cs
+++ b/mcs/class/I18N/Rare/CP1148.cs
@@ -140,9 +140,7 @@ public class CP1148 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP1149.cs b/mcs/class/I18N/Rare/CP1149.cs
index 28682452537..9c366e9bd74 100644
--- a/mcs/class/I18N/Rare/CP1149.cs
+++ b/mcs/class/I18N/Rare/CP1149.cs
@@ -140,9 +140,7 @@ public class CP1149 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20273.cs b/mcs/class/I18N/Rare/CP20273.cs
index 00d2f8080b0..a42803d3424 100644
--- a/mcs/class/I18N/Rare/CP20273.cs
+++ b/mcs/class/I18N/Rare/CP20273.cs
@@ -140,9 +140,7 @@ public class CP20273 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20277.cs b/mcs/class/I18N/Rare/CP20277.cs
index 72b63c256f5..42b96d6e1e8 100644
--- a/mcs/class/I18N/Rare/CP20277.cs
+++ b/mcs/class/I18N/Rare/CP20277.cs
@@ -140,9 +140,7 @@ public class CP20277 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20278.cs b/mcs/class/I18N/Rare/CP20278.cs
index a38e561e5ca..e542fdcbe3d 100644
--- a/mcs/class/I18N/Rare/CP20278.cs
+++ b/mcs/class/I18N/Rare/CP20278.cs
@@ -140,9 +140,7 @@ public class CP20278 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20280.cs b/mcs/class/I18N/Rare/CP20280.cs
index cbb0462787e..d1100b5d188 100644
--- a/mcs/class/I18N/Rare/CP20280.cs
+++ b/mcs/class/I18N/Rare/CP20280.cs
@@ -140,9 +140,7 @@ public class CP20280 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20284.cs b/mcs/class/I18N/Rare/CP20284.cs
index 13a1db81034..d54dee0477b 100644
--- a/mcs/class/I18N/Rare/CP20284.cs
+++ b/mcs/class/I18N/Rare/CP20284.cs
@@ -140,9 +140,7 @@ public class CP20284 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20285.cs b/mcs/class/I18N/Rare/CP20285.cs
index 5227ec7e293..81967392bc9 100644
--- a/mcs/class/I18N/Rare/CP20285.cs
+++ b/mcs/class/I18N/Rare/CP20285.cs
@@ -140,9 +140,7 @@ public class CP20285 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20290.cs b/mcs/class/I18N/Rare/CP20290.cs
index 781028a31eb..8495bdebf9f 100644
--- a/mcs/class/I18N/Rare/CP20290.cs
+++ b/mcs/class/I18N/Rare/CP20290.cs
@@ -140,9 +140,7 @@ public class CP20290 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20297.cs b/mcs/class/I18N/Rare/CP20297.cs
index 4eef20def25..f2225404fa3 100644
--- a/mcs/class/I18N/Rare/CP20297.cs
+++ b/mcs/class/I18N/Rare/CP20297.cs
@@ -140,9 +140,7 @@ public class CP20297 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20420.cs b/mcs/class/I18N/Rare/CP20420.cs
index 7c832737d83..02c3b6454b9 100644
--- a/mcs/class/I18N/Rare/CP20420.cs
+++ b/mcs/class/I18N/Rare/CP20420.cs
@@ -140,9 +140,7 @@ public class CP20420 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20424.cs b/mcs/class/I18N/Rare/CP20424.cs
index 1f521ddf773..63702909697 100644
--- a/mcs/class/I18N/Rare/CP20424.cs
+++ b/mcs/class/I18N/Rare/CP20424.cs
@@ -140,9 +140,7 @@ public class CP20424 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP20871.cs b/mcs/class/I18N/Rare/CP20871.cs
index d26dfe1371a..8924ef3f764 100644
--- a/mcs/class/I18N/Rare/CP20871.cs
+++ b/mcs/class/I18N/Rare/CP20871.cs
@@ -140,9 +140,7 @@ public class CP20871 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP21025.cs b/mcs/class/I18N/Rare/CP21025.cs
index d662161d249..a343dc7b23b 100644
--- a/mcs/class/I18N/Rare/CP21025.cs
+++ b/mcs/class/I18N/Rare/CP21025.cs
@@ -140,9 +140,7 @@ public class CP21025 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP37.cs b/mcs/class/I18N/Rare/CP37.cs
index 85a57df5168..35890fd4890 100644
--- a/mcs/class/I18N/Rare/CP37.cs
+++ b/mcs/class/I18N/Rare/CP37.cs
@@ -140,9 +140,7 @@ public class CP37 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP500.cs b/mcs/class/I18N/Rare/CP500.cs
index fdf654d33e7..7038eb54b6f 100644
--- a/mcs/class/I18N/Rare/CP500.cs
+++ b/mcs/class/I18N/Rare/CP500.cs
@@ -140,9 +140,7 @@ public class CP500 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP708.cs b/mcs/class/I18N/Rare/CP708.cs
index 743af5cd193..fba414367da 100644
--- a/mcs/class/I18N/Rare/CP708.cs
+++ b/mcs/class/I18N/Rare/CP708.cs
@@ -140,9 +140,7 @@ public class CP708 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP852.cs b/mcs/class/I18N/Rare/CP852.cs
index 431a6016f5c..f7d9afb9be2 100644
--- a/mcs/class/I18N/Rare/CP852.cs
+++ b/mcs/class/I18N/Rare/CP852.cs
@@ -140,9 +140,7 @@ public class CP852 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP855.cs b/mcs/class/I18N/Rare/CP855.cs
index 8f4d0dba3f1..83a6612719e 100644
--- a/mcs/class/I18N/Rare/CP855.cs
+++ b/mcs/class/I18N/Rare/CP855.cs
@@ -140,9 +140,7 @@ public class CP855 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP857.cs b/mcs/class/I18N/Rare/CP857.cs
index 0d05a07e96e..514748a0919 100644
--- a/mcs/class/I18N/Rare/CP857.cs
+++ b/mcs/class/I18N/Rare/CP857.cs
@@ -140,9 +140,7 @@ public class CP857 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP858.cs b/mcs/class/I18N/Rare/CP858.cs
index c05a03263db..11c6882cee2 100644
--- a/mcs/class/I18N/Rare/CP858.cs
+++ b/mcs/class/I18N/Rare/CP858.cs
@@ -140,9 +140,7 @@ public class CP858 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP862.cs b/mcs/class/I18N/Rare/CP862.cs
index dc3543466ee..c7c48351d61 100644
--- a/mcs/class/I18N/Rare/CP862.cs
+++ b/mcs/class/I18N/Rare/CP862.cs
@@ -140,9 +140,7 @@ public class CP862 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP864.cs b/mcs/class/I18N/Rare/CP864.cs
index 1513327e132..23434eb8962 100644
--- a/mcs/class/I18N/Rare/CP864.cs
+++ b/mcs/class/I18N/Rare/CP864.cs
@@ -140,9 +140,7 @@ public class CP864 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP866.cs b/mcs/class/I18N/Rare/CP866.cs
index 718488abbda..da5d4da5709 100644
--- a/mcs/class/I18N/Rare/CP866.cs
+++ b/mcs/class/I18N/Rare/CP866.cs
@@ -140,9 +140,7 @@ public class CP866 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP869.cs b/mcs/class/I18N/Rare/CP869.cs
index 44bf879566c..2c6cc51455e 100644
--- a/mcs/class/I18N/Rare/CP869.cs
+++ b/mcs/class/I18N/Rare/CP869.cs
@@ -140,9 +140,7 @@ public class CP869 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP870.cs b/mcs/class/I18N/Rare/CP870.cs
index c35e4a70eda..fee07546e34 100644
--- a/mcs/class/I18N/Rare/CP870.cs
+++ b/mcs/class/I18N/Rare/CP870.cs
@@ -140,9 +140,7 @@ public class CP870 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/Rare/CP875.cs b/mcs/class/I18N/Rare/CP875.cs
index 70c558c29e5..c3a346d7519 100644
--- a/mcs/class/I18N/Rare/CP875.cs
+++ b/mcs/class/I18N/Rare/CP875.cs
@@ -140,9 +140,7 @@ public class CP875 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP10000.cs b/mcs/class/I18N/West/CP10000.cs
index 22923759c68..011669f3081 100644
--- a/mcs/class/I18N/West/CP10000.cs
+++ b/mcs/class/I18N/West/CP10000.cs
@@ -140,9 +140,7 @@ public class CP10000 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP10079.cs b/mcs/class/I18N/West/CP10079.cs
index 77735acfb59..09867f420d0 100644
--- a/mcs/class/I18N/West/CP10079.cs
+++ b/mcs/class/I18N/West/CP10079.cs
@@ -140,9 +140,7 @@ public class CP10079 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP1250.cs b/mcs/class/I18N/West/CP1250.cs
index ec049ca1a0a..e2218213980 100644
--- a/mcs/class/I18N/West/CP1250.cs
+++ b/mcs/class/I18N/West/CP1250.cs
@@ -140,9 +140,7 @@ public class CP1250 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP1252.cs b/mcs/class/I18N/West/CP1252.cs
index 541767128b8..72908a46fd5 100644
--- a/mcs/class/I18N/West/CP1252.cs
+++ b/mcs/class/I18N/West/CP1252.cs
@@ -140,9 +140,7 @@ public class CP1252 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP1253.cs b/mcs/class/I18N/West/CP1253.cs
index 28f01e32dcf..50d8d9d8930 100644
--- a/mcs/class/I18N/West/CP1253.cs
+++ b/mcs/class/I18N/West/CP1253.cs
@@ -140,9 +140,7 @@ public class CP1253 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP28592.cs b/mcs/class/I18N/West/CP28592.cs
index f735b0d7b89..8db6418d5c7 100644
--- a/mcs/class/I18N/West/CP28592.cs
+++ b/mcs/class/I18N/West/CP28592.cs
@@ -140,9 +140,7 @@ public class CP28592 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP28593.cs b/mcs/class/I18N/West/CP28593.cs
index 55c0b4d83cf..b23091ce0c5 100644
--- a/mcs/class/I18N/West/CP28593.cs
+++ b/mcs/class/I18N/West/CP28593.cs
@@ -140,9 +140,7 @@ public class CP28593 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP28597.cs b/mcs/class/I18N/West/CP28597.cs
index e7787fb201b..76b1ea2f55d 100644
--- a/mcs/class/I18N/West/CP28597.cs
+++ b/mcs/class/I18N/West/CP28597.cs
@@ -140,9 +140,7 @@ public class CP28597 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP28605.cs b/mcs/class/I18N/West/CP28605.cs
index 317dcdb8257..06762fe6bb2 100644
--- a/mcs/class/I18N/West/CP28605.cs
+++ b/mcs/class/I18N/West/CP28605.cs
@@ -140,9 +140,7 @@ public class CP28605 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP437.cs b/mcs/class/I18N/West/CP437.cs
index 4b681f193b7..dd4d584152d 100644
--- a/mcs/class/I18N/West/CP437.cs
+++ b/mcs/class/I18N/West/CP437.cs
@@ -140,9 +140,7 @@ public class CP437 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP850.cs b/mcs/class/I18N/West/CP850.cs
index 9344b80e4a0..942b71529c4 100644
--- a/mcs/class/I18N/West/CP850.cs
+++ b/mcs/class/I18N/West/CP850.cs
@@ -140,9 +140,7 @@ public class CP850 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP860.cs b/mcs/class/I18N/West/CP860.cs
index 268b44d35e6..134a900f62c 100644
--- a/mcs/class/I18N/West/CP860.cs
+++ b/mcs/class/I18N/West/CP860.cs
@@ -140,9 +140,7 @@ public class CP860 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP861.cs b/mcs/class/I18N/West/CP861.cs
index 794ea795ad4..747d1c7c37f 100644
--- a/mcs/class/I18N/West/CP861.cs
+++ b/mcs/class/I18N/West/CP861.cs
@@ -140,9 +140,7 @@ public class CP861 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP863.cs b/mcs/class/I18N/West/CP863.cs
index e8080c6fae4..807af133e14 100644
--- a/mcs/class/I18N/West/CP863.cs
+++ b/mcs/class/I18N/West/CP863.cs
@@ -140,9 +140,7 @@ public class CP863 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);
diff --git a/mcs/class/I18N/West/CP865.cs b/mcs/class/I18N/West/CP865.cs
index e56b6472ec5..53a5bcc1761 100644
--- a/mcs/class/I18N/West/CP865.cs
+++ b/mcs/class/I18N/West/CP865.cs
@@ -140,9 +140,7 @@ public class CP865 : ByteEncoding
 		int ch;
 		int charIndex = 0;
 		int byteIndex = 0;
-#if NET_2_0
 		EncoderFallbackBuffer buffer = null;
-#endif
 		while (charCount > 0)
 		{
 			ch = (int)(chars[charIndex]);