Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ConnectionConsumerCallback.cs

@@ -28,9 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 namespace System.Web.UI.WebControls.WebParts {
 	public delegate void ConnectionConsumerCallback (object conn);
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ConnectionInterfaceCollection.cs

@@ -26,7 +26,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -78,4 +77,3 @@ namespace System.Web.UI.WebControls.WebParts
 		}
 	}
 }
-#endif

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ConnectionPoint.cs

@@ -25,7 +25,6 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 using System.Web;
 using System.Reflection;
 
@@ -84,4 +83,3 @@ namespace System.Web.UI.WebControls.WebParts {
 		}	
         }
 }
-#endif

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ConnectionPointType.cs

@@ -25,11 +25,9 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 namespace System.Web.UI.WebControls.WebParts {
         public enum ConnectionPointType {
                 Consumer = 0,
 		Provider = 1		
         }
 }
-#endif

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ConnectionProviderCallback.cs

@@ -28,9 +28,7 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 namespace System.Web.UI.WebControls.WebParts {
 	public delegate object ConnectionProviderCallback ();
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ConsumerConnectionPoint.cs

@@ -25,7 +25,6 @@
 // Copyright (C) 2004 Novell, Inc (http://www.novell.com)
 //
 
-#if NET_2_0
 using System.Web;
 using System.Reflection;
 
@@ -54,4 +53,3 @@ namespace System.Web.UI.WebControls.WebParts
 		}			
 	}
 }
-#endif

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/EditorPart.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Collections;
 using System.ComponentModel;
@@ -109,4 +108,3 @@ namespace System.Web.UI.WebControls.WebParts
 	}
 }
 
-#endif

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/EditorPartCollection.cs

@@ -27,7 +27,6 @@
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
 
-#if NET_2_0
 
 using System.Collections;
 
@@ -82,4 +81,3 @@ namespace System.Web.UI.WebControls.WebParts
 
 }
 
-#endif

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IPersonalizable.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.Collections;
 
@@ -42,5 +41,4 @@ namespace System.Web.UI.WebControls.WebParts
 		bool IsDirty { get; }
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITrackingPersonalizable.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.Collections.Specialized;
 
@@ -44,5 +43,4 @@ namespace System.Web.UI.WebControls.WebParts
 		bool TracksChanges { get; }
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/ITransformerConfigurationControl.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 namespace System.Web.UI.WebControls.WebParts
 {
@@ -38,5 +37,4 @@ namespace System.Web.UI.WebControls.WebParts
 		event EventHandler Succeeded;
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IVersioningPersonalizable.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.Collections;
 
@@ -39,5 +38,4 @@ namespace System.Web.UI.WebControls.WebParts
 		void Load (IDictionary unknownProperties);
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebActionable.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 namespace System.Web.UI.WebControls.WebParts
 {
@@ -37,5 +36,4 @@ namespace System.Web.UI.WebControls.WebParts
 		WebPartVerbCollection Verbs { get; }
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebEditable.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 namespace System.Web.UI.WebControls.WebParts
 {
@@ -39,5 +38,4 @@ namespace System.Web.UI.WebControls.WebParts
 		object WebBrowsableObject { get; }
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPart.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 namespace System.Web.UI.WebControls.WebParts
 {
@@ -42,5 +41,4 @@ namespace System.Web.UI.WebControls.WebParts
 		string TitleUrl { get; set; }
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartField.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.ComponentModel;
 
@@ -42,5 +41,4 @@ namespace System.Web.UI.WebControls.WebParts
 
 	public delegate void FieldCallback (object fieldValue);
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartHttpHandler.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 namespace System.Web.UI.WebControls.WebParts
 {
@@ -37,5 +36,4 @@ namespace System.Web.UI.WebControls.WebParts
 		PersonalizationScope DesiredScope { get; }
 	}
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartParameters.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.ComponentModel;
 using System.Collections;
@@ -45,5 +44,4 @@ namespace System.Web.UI.WebControls.WebParts
 
 	public delegate void ParametersCallback (IDictionary parametersData);
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartRow.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.ComponentModel;
 
@@ -42,5 +41,4 @@ namespace System.Web.UI.WebControls.WebParts
 
 	public delegate void RowCallback (object rowData);
 }
-#endif
 

mcs/class/System.Web/System.Web.UI.WebControls.WebParts/IWebPartTable.cs

@@ -28,7 +28,6 @@
 //
 
 
-#if NET_2_0
 
 using System.Collections;
 using System.ComponentModel;
@@ -43,5 +42,4 @@ namespace System.Web.UI.WebControls.WebParts
 
 	public delegate void TableCallback (ICollection tableData);
 }
-#endif