Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPager.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -497,4 +496,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerCommandEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Security.Permissions;
 
@@ -73,4 +72,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerField.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Specialized;
 using System.ComponentModel;
@@ -267,4 +266,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerFieldCollection.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -201,4 +200,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerFieldCommandEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -58,4 +57,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/DataPagerFieldItem.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.ComponentModel;
 using System.Security.Permissions;
@@ -70,4 +69,3 @@ namespace System.Web.UI.WebControls
 
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/HelperExtensions.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Specialized;
@@ -46,4 +45,3 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/IPageableItemContainer.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Security.Permissions;
 using System.Web;
@@ -47,4 +46,3 @@ namespace System.Web.UI.WebControls
 		event EventHandler<PageEventArgs> TotalRowCountAvailable;
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/InsertItemPosition.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 namespace System.Web.UI.WebControls
 {
 	public enum InsertItemPosition
@@ -37,4 +36,3 @@ namespace System.Web.UI.WebControls
 		LastItem
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSource.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.ComponentModel;
@@ -439,4 +438,3 @@ namespace System.Web.UI.WebControls
 		#endregion
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceContextEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -56,4 +55,3 @@ namespace System.Web.UI.WebControls
 		public DataSourceOperation Operation { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceDeleteEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -57,4 +56,3 @@ namespace System.Web.UI.WebControls
 		public object OriginalObject { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceDisposeEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -48,4 +47,3 @@ namespace System.Web.UI.WebControls
 		public object ObjectInstance { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceInsertEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -57,4 +56,3 @@ namespace System.Web.UI.WebControls
 		public object NewObject { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceSelectEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -73,4 +72,3 @@ namespace System.Web.UI.WebControls
 		public IDictionary<string, object> WhereParameters { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceStatusEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -66,4 +65,3 @@ namespace System.Web.UI.WebControls
 		public int TotalRowCount { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceUpdateEventArgs.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -62,4 +61,3 @@ namespace System.Web.UI.WebControls
 		public object OriginalObject { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceValidationException.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections.Generic;
 using System.ComponentModel;
@@ -83,4 +82,3 @@ namespace System.Web.UI.WebControls
 		public IDictionary<string, Exception> InnerExceptions { get; private set; }
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/LinqDataSourceView.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 
 // FIXME: in general we should create something like
 // System.Web.Query,Dynamic.DynamicClass to execute DataContext operations.
@@ -564,4 +563,3 @@ namespace System.Web.UI.WebControls
 		#endregion
 	}
 }
-#endif

mcs/class/System.Web.Extensions/System.Web.UI.WebControls/ListView.cs

@@ -27,7 +27,6 @@
 // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 //
-#if NET_3_5
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -2059,5 +2058,4 @@ namespace System.Web.UI.WebControls
 		}
 	}
 }
-#endif