Imported Upstream version 4.3.2.467

Former-commit-id: 9c2cb47f45fa221e661ab616387c9cda183f283d

mcs/class/System.Web/Test/standalone-tests/ApplicationPreStartMethods.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -292,4 +291,3 @@ ExternalAssembly1 added
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/BuildManagerCacheFiles.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -157,4 +156,3 @@ namespace StandAloneTests.BuildManagerCacheFiles
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/ControlRenderingCompatibilityVersion.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -75,4 +74,3 @@ namespace StandAloneTests.ControlRenderingCompatibilityVersion
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/Control_GetUniqueIDRelativeTo.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -113,4 +112,3 @@ Item: 2; Relative to: __Page; Result: exception System.InvalidOperationException
 	}
 }
 
-#endif

mcs/class/System.Web/Test/standalone-tests/DisabledAttributeRendering.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -100,4 +99,3 @@ namespace StandAloneTests.DisabledAttributeRendering
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/EnableFormsAuthentication.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -320,4 +319,3 @@ namespace StandAloneTests.EnableFormsAuthentication
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/GridViewShowHeaderWhenEmpty.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -84,4 +83,3 @@ namespace StandAloneTests.GridViewShowHeaderWhenEmpty
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/GridViewSortingStyles.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -118,4 +117,3 @@ namespace StandAloneTests.GridViewSortingStyles
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/Menu_4.0_List.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -62,4 +61,3 @@ namespace StandAloneTests.Menu_40_List
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/OutputCacheProvider.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -163,4 +162,3 @@ Default context: TestAnotherInMemoryProvider
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/PageMetaAttributes.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -64,4 +63,3 @@ namespace StandAloneTests.PageMetaAttributes
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/PageParserDefaultTypeProperties.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -124,4 +123,3 @@ namespace StandAloneTests.PageParserDefaultTypeProperties
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/RegisterBuildProvider.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -84,4 +83,3 @@ namespace StandAloneTests.RegisterBuildProvider
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/RequestValidator.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -207,4 +206,3 @@ Request validation source: {3}
 	}
 }
 
-#endif

mcs/class/System.Web/Test/standalone-tests/RequestValidatorTestGenerated.cs

@@ -1,4 +1,4 @@
-#if NET_4_0
+
 using System;
 using System.Collections.Generic;
 
@@ -258,4 +258,3 @@ namespace StandAloneTests.RequestValidator.Generated
 		}
 	}
 }
-#endif

mcs/class/System.Web/Test/standalone-tests/Unhandled_Exception_Global_Asax.cs

@@ -65,11 +65,7 @@ namespace StandAloneTests.Unhandled_Exception_Global_Asax
 
 		void Default_Aspx (string result, TestRunItem runItem)
 		{
-#if NET_4_0
 			string originalHtml1 = @"[System.Web.HttpUnhandledException]: Exception of type 'System.Web.HttpUnhandledException' was thrown.";
-#else
-			string originalHtml1 = @"[System.Web.HttpUnhandledException]: Exception of type 'System.Web.HttpUnhandledException' was thrown.";
-#endif
 			string originalHtml2 = @"[System.InvalidOperationException]: test";
 			
 			Assert.IsTrue (result.IndexOf (originalHtml1) != -1, "#A1");

mcs/class/System.Web/Test/standalone-tests/WebControlsMustUseIsEnabled_Bug571715.cs

@@ -58,11 +58,7 @@ namespace StandAloneTests.WebControlsMustUseIsEnabled_Bug571715
 
 		void Default_Aspx (string result, TestRunItem runItem)
 		{
-#if NET_4_0
 			string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"GridView1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FULLNAME</th><th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1</td><td>Sheryl Hunter</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl02$DeleteBtn\" value=\"Delete\" id=\"GridView1_DeleteBtn_0\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>2</td><td>Dean Straight</td><td class=\"aspNetDisabled\" align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl03$DeleteBtn\" value=\"Delete\" disabled=\"disabled\" id=\"GridView1_DeleteBtn_1\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>3</td><td>Marjorie Green</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl04$DeleteBtn\" value=\"Delete\" id=\"GridView1_DeleteBtn_2\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#else
-			string originalHtml = "<div>\r\n\t<table cellspacing=\"0\" rules=\"all\" border=\"1\" id=\"GridView1\" style=\"border-collapse:collapse;\">\r\n\t\t<tr>\r\n\t\t\t<th scope=\"col\">ID</th><th scope=\"col\">FULLNAME</th><th scope=\"col\">&nbsp;</th>\r\n\t\t</tr><tr>\r\n\t\t\t<td>1</td><td>Sheryl Hunter</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl02$DeleteBtn\" value=\"Delete\" id=\"GridView1_ctl02_DeleteBtn\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>2</td><td>Dean Straight</td><td disabled=\"disabled\" align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl03$DeleteBtn\" value=\"Delete\" disabled=\"disabled\" id=\"GridView1_ctl03_DeleteBtn\" /></td>\r\n\t\t</tr><tr>\r\n\t\t\t<td>3</td><td>Marjorie Green</td><td align=\"left\" style=\"width:60px;\"><input type=\"submit\" name=\"GridView1$ctl04$DeleteBtn\" value=\"Delete\" id=\"GridView1_ctl04_DeleteBtn\" /></td>\r\n\t\t</tr>\r\n\t</table>\r\n</div>";
-#endif
 			Helpers.ExtractAndCompareCodeFromHtml (result, originalHtml, "#A1");
 		}
 	}

mcs/class/System.Web/Test/standalone-tests/WebFormsRouting.cs

@@ -25,7 +25,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_4_0
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -171,4 +170,3 @@ namespace StandAloneTests.WebFormsRouting
 		}
 	}
 }
-#endif