Imported Upstream version 3.6.0

Former-commit-id: da6be194a6b1221998fc28233f2503bd61dd9d14

mcs/class/System.Web/Test/standalone/masterpages/77278/TestConfig.aspx

@@ -0,0 +1,59 @@
+<%@ Page Language="C#" MasterPageFile="simple.master" %>
+
+<script runat="server">
+
+
+override protected void OnPreInit(EventArgs e)
+{
+
+    //this is another bug if you uncomment this
+    //it works as expected on windows but
+    //causes a null reference in the page load event on mono
+    
+    base.OnPreInit(e);
+    this.MasterPageFile = "simple2.master";
+}
+
+override protected void OnInit(EventArgs e)
+{
+
+    base.OnInit(e);
+}
+
+
+private void Page_PreInit (object sender, EventArgs e)
+{
+	this.MasterPageFile = "simple2.master";
+}
+
+
+private void Page_Load (object sender, EventArgs e)
+{
+	lblHelloWeb.Text = "Hello Web!";
+	
+	//TestKey
+
+}
+
+private void btnTestConfig_Click (object sender, EventArgs e)
+{
+	//this displays the value on windows but not on mono  r55575
+	this.lblTestConfig.Text = System.Configuration.ConfigurationSettings.AppSettings.Get("TestKey");
+	
+	
+
+}
+
+
+</script>
+
+<asp:Content ID="Content1" ContentPlaceHolderID="ContentPlaceHolder1" Runat="server">
+
+Contents go here
+<hr />
+<asp:Label id="lblHelloWeb" runat="server" />
+<hr />
+<asp:Button id="btnTestConfig" runat="server" OnClick="btnTestConfig_Click" Text="Test Config"  />
+<asp:Label id="lblTestConfig" runat="server" />
+
+</asp:Content>

mcs/class/System.Web/Test/standalone/masterpages/77278/Web.Config

@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<!-- 
+    Note: As an alternative to hand editing this file you can use the 
+    web admin tool to configure settings for your application. Use
+    the Website->Asp.Net Configuration option in Visual Studio.
+    A full list of settings and comments can be found in 
+    machine.config.comments usually located in 
+    \Windows\Microsoft.Net\Framework\v2.x\Config 
+-->
+<configuration>
+	<appSettings>
+	
+	<add key="TestKey" value="this is coming from the web.config" />
+	
+	</appSettings>
+	<connectionStrings/>
+	
+	<system.web>
+		<!-- 
+            Set compilation debug="true" to insert debugging 
+            symbols into the compiled page. Because this 
+            affects performance, set this value to true only 
+            during development.
+        -->
+		<compilation debug="true"/>
+		<!--
+            The <authentication> section enables configuration 
+            of the security authentication mode used by 
+            ASP.NET to identify an incoming user. 
+        -->
+		<authentication mode="Windows"/>
+		<!--
+            The <customErrors> section enables configuration 
+            of what to do if/when an unhandled error occurs 
+            during the execution of a request. Specifically, 
+            it enables developers to configure html error pages 
+            to be displayed in place of a error stack trace.
+
+        <customErrors mode="RemoteOnly" defaultRedirect="GenericErrorPage.htm">
+            <error statusCode="403" redirect="NoAccess.htm" />
+            <error statusCode="404" redirect="FileNotFound.htm" />
+        </customErrors>
+        -->
+	</system.web>
+</configuration>

mcs/class/System.Web/Test/standalone/masterpages/77278/simple.master

@@ -0,0 +1,19 @@
+<%@ Master Language="C#"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Simple Master Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <div>
+		What's inside the following box is a placeholder:
+		<div style='border:solid 2px red; padding:10px'>
+        <asp:contentplaceholder id="ContentPlaceHolder1" runat="server"></asp:contentplaceholder>
+		</div>
+		That's all!
+    </form>
+</body>
+</html>

mcs/class/System.Web/Test/standalone/masterpages/77278/simple2.master

@@ -0,0 +1,20 @@
+<%@ Master Language="C#"%>
+
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" >
+<head runat="server">
+    <title>Simple Master Page</title>
+</head>
+<body>
+    <form id="form1" runat="server">
+    <h3>Simple2</h3>
+    <div>
+		What's inside the following box is a placeholder:
+		<div style='border:solid 2px red; padding:10px'>
+        <asp:contentplaceholder id="ContentPlaceHolder1" runat="server"></asp:contentplaceholder>
+		</div>
+		That's all!
+    </form>
+</body>
+</html>