Fixed missing protected internal modifier

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/AnnouncementEndpointElement.cs

@@ -56,7 +56,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			set { base [discovery_version] = value; }
 		}
 
-		protected override Type EndpointType {
+		protected internal override Type EndpointType {
 			get { return typeof (AnnouncementEndpoint); }
 		}
 		
@@ -71,7 +71,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 		
-		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
+		protected internal override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
 			if (contractDescription == null)
 				throw new ArgumentNullException ("contractDescription");
@@ -81,7 +81,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			return ret;
 		}
 		
-		protected override void InitializeFrom (ServiceEndpoint endpoint)
+		protected internal override void InitializeFrom (ServiceEndpoint endpoint)
 		{
 			if (endpoint == null)
 				throw new ArgumentNullException ("endpoint");

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryClientElement.cs

@@ -92,14 +92,14 @@ namespace System.ServiceModel.Discovery.Configuration
 			FindCriteria.CopyFrom (ce.FindCriteria);
 		}
 
-		protected override BindingElement CreateBindingElement ()
+		protected internal override BindingElement CreateBindingElement ()
 		{
 			var be = new DiscoveryClientBindingElement ();
 			ApplyConfiguration (be);
 			return be;
 		}
 
-		protected override void InitializeFrom (BindingElement bindingElement)
+		protected internal override void InitializeFrom (BindingElement bindingElement)
 		{
 			if (bindingElement == null)
 				throw new ArgumentNullException ("bindingElement");

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DiscoveryEndpointElement.cs

@@ -71,7 +71,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			set { base [max_response_delay] = value; }
 		}
 		
-		protected override Type EndpointType {
+		protected internal override Type EndpointType {
 			get { return typeof (DiscoveryEndpoint); }
 		}
 		
@@ -79,7 +79,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 		
-		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
+		protected internal override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
 			if (contractDescription == null)
 				throw new ArgumentNullException ("contractDescription");
@@ -89,7 +89,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			return ret;
 		}
 		
-		protected override void InitializeFrom (ServiceEndpoint endpoint)
+		protected internal override void InitializeFrom (ServiceEndpoint endpoint)
 		{
 			if (endpoint == null)
 				throw new ArgumentNullException ("endpoint");

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/DynamicEndpointElement.cs

@@ -52,7 +52,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return (DiscoveryClientSettingsElement) base [discovery_client_settings]; }
 		}
 		
-		protected override Type EndpointType {
+		protected internal override Type EndpointType {
 			get { return typeof (DynamicEndpoint); }
 		}
 		
@@ -60,7 +60,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 		
-		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
+		protected internal override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
 			throw new NotImplementedException ();
 		}

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/EndpointDiscoveryElement.cs

@@ -83,7 +83,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 		
-		protected override object CreateBehavior ()
+		protected internal override object CreateBehavior ()
 		{
 			var ret = new EndpointDiscoveryBehavior () { Enabled = this.Enabled };
 			foreach (ContractTypeNameElement ctn in ContractTypeNames)

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/ServiceDiscoveryElement.cs

@@ -59,7 +59,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 		
-		protected override object CreateBehavior ()
+		protected internal override object CreateBehavior ()
 		{
 			throw new NotImplementedException ();
 		}

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpAnnouncementEndpointElement.cs

@@ -53,7 +53,7 @@ namespace System.ServiceModel.Discovery.Configuration
 		{
 		}
 		
-		protected override Type EndpointType {
+		protected internal override Type EndpointType {
 			get { return typeof (UdpAnnouncementEndpoint); }
 		}
 		
@@ -79,7 +79,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 
-		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
+		protected internal override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
 			if (contractDescription == null)
 				throw new ArgumentNullException ("contractDescription");
@@ -101,7 +101,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			return ret;
 		}
 
-		protected override void InitializeFrom (ServiceEndpoint endpoint)
+		protected internal override void InitializeFrom (ServiceEndpoint endpoint)
 		{
 			if (endpoint == null)
 				throw new ArgumentNullException ("endpoint");

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Configuration/UdpDiscoveryEndpointElement.cs

@@ -61,7 +61,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			set { base [discovery_mode] = value; }
 		}
 
-		protected override Type EndpointType {
+		protected internal override Type EndpointType {
 			get { return typeof (UdpDiscoveryEndpoint); }
 		}
 
@@ -87,7 +87,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			get { return properties; }
 		}
 		
-		protected override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
+		protected internal override ServiceEndpoint CreateServiceEndpoint (ContractDescription contractDescription)
 		{
 			if (contractDescription == null)
 				throw new ArgumentNullException ("contractDescription");
@@ -109,7 +109,7 @@ namespace System.ServiceModel.Discovery.Configuration
 			return ret;
 		}
 
-		protected override void InitializeFrom (ServiceEndpoint endpoint)
+		protected internal override void InitializeFrom (ServiceEndpoint endpoint)
 		{
 			if (endpoint == null)
 				throw new ArgumentNullException ("endpoint");

mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryChannelDispatcher.cs

@@ -60,22 +60,22 @@ namespace System.ServiceModel.Discovery
 		}
 
 		// might be different value
-		protected override TimeSpan DefaultOpenTimeout {
+		protected internal override TimeSpan DefaultOpenTimeout {
 			get { return client.Endpoint.Binding.OpenTimeout; }
 		}
 
 		// might be different value
-		protected override TimeSpan DefaultCloseTimeout {
+		protected internal override TimeSpan DefaultCloseTimeout {
 			get { return client.Endpoint.Binding.CloseTimeout; }
 		}
 
-		protected override void Attach (ServiceHostBase host)
+		protected internal override void Attach (ServiceHostBase host)
 		{
 			base.Attach (host);
 			this.host = host;
 		}
 
-		protected override void Detach (ServiceHostBase host)
+		protected internal override void Detach (ServiceHostBase host)
 		{
 			base.Detach (host);
 			this.host = null;

mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.Configuration/RoutingExtensionElement.cs

@@ -34,7 +34,7 @@ namespace System.ServiceModel.Routing.Configuration
 			set { base ["soapProcessingEnabled"] = value; }
 		}
 
-		protected override object CreateBehavior ()
+		protected internal override object CreateBehavior ()
 		{
 			var table = RoutingSection.CreateFilterTable (FilterTableName);
 

mcs/class/System.ServiceModel.Routing/System.ServiceModel.Routing.Configuration/SoapProcessingExtensionElement.cs

@@ -22,7 +22,7 @@ namespace System.ServiceModel.Routing.Configuration
 			set { base ["processMessages"] = value; }
 		}
 
-		protected override object CreateBehavior ()
+		protected internal override object CreateBehavior ()
 		{
 			return new SoapProcessingBehavior () { ProcessMessages = this.ProcessMessages };
 		}

mcs/class/System.ServiceModel.Web/System.ServiceModel.Configuration/WebHttpBindingCollectionElement.cs

@@ -63,7 +63,7 @@ namespace System.ServiceModel.Configuration
 
 		// Methods
 
-		protected override Binding GetDefault ()
+		protected internal override Binding GetDefault ()
 		{
 			return new WebHttpBinding ();
 		}

mcs/class/System.ServiceModel.Web/System.ServiceModel.Configuration/WebHttpBindingElement.cs

@@ -279,7 +279,7 @@ namespace System.ServiceModel.Configuration
 			Security.ApplyConfiguration (webBinding.Security);
 		}
 
-		protected override void InitializeFrom (Binding binding)
+		protected internal override void InitializeFrom (Binding binding)
 		{
 			WebHttpBinding b = (WebHttpBinding)binding;
 			

mcs/class/System.ServiceModel/System.ServiceModel.Activation/ServiceHostFactory.cs

@@ -40,7 +40,7 @@ namespace System.ServiceModel.Activation
 		}
 
 		[MonoTODO ("untested")]
-		protected internal virtual ServiceHost CreateServiceHost (
+		protected virtual ServiceHost CreateServiceHost (
 			Type serviceType, Uri [] baseAddresses)
 		{
 			return new ServiceHost (serviceType, baseAddresses);

mcs/class/System.ServiceModel/System.ServiceModel.Channels/SvcHttpHandler.cs

@@ -128,10 +128,10 @@ namespace System.ServiceModel.Channels
 
 			//ServiceHost for this not created yet
 			var baseUri = new Uri (new Uri (HttpContext.Current.Request.Url.GetLeftPart (UriPartial.Authority)), path);
-			if (factory_type != null) {
-				host = ((ServiceHostFactory) Activator.CreateInstance (factory_type)).CreateServiceHost (type, new Uri [] {baseUri});
-			}
-			else
+//			if (factory_type != null) {
+//				host = ((ServiceHostFactory) Activator.CreateInstance (factory_type)).CreateServiceHost (type, new Uri [] {baseUri});
+//			}
+//			else
 				host = new ServiceHost (type, baseUri);
 			host.Extensions.Add (new VirtualPathExtension (baseUri.AbsolutePath));
 

mcs/class/System.Web.DynamicData/System.Web.DynamicData/DynamicField.cs

@@ -64,7 +64,9 @@ namespace System.Web.DynamicData
 		}
 
 		public virtual string DataField {
-			get { return ViewState.GetString ("_DataField", String.Empty); }
+			get {
+				return (string) ViewState ["_DataField"] ?? String.Empty;
+			}
 			set {
 				ViewState ["_DataField"] = value;
 				OnFieldChanged ();
@@ -77,7 +79,7 @@ namespace System.Web.DynamicData
 
 		public override string HeaderText {
 			get {
-				string s = ViewState.GetString ("headerText", null);
+				string s = (string) ViewState ["headerText"];
 				if (s != null)
 					return s;
 
@@ -118,7 +120,7 @@ namespace System.Web.DynamicData
 
 		public override string SortExpression {
 			get {
-				string s = ViewState.GetString ("sortExpression", null);
+				string s = (string) ViewState ["sortExpression"];
 				if (s != null)
 					return s;
 
@@ -134,10 +136,7 @@ namespace System.Web.DynamicData
 
 		public virtual string UIHint {
 			get {
-				string s = ViewState.GetString ("uiHint", null);
-				if (s == null)
-					return String.Empty;
-				return s;
+				return (string) ViewState ["uiHint"] ?? String.Empty;
 			}
 			
 			set {

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

@@ -1399,7 +1399,7 @@ namespace System.Web.UI.WebControls
 			_dataKeys = null;
 		}
 		
-		protected override void LoadControlState (object savedState)
+		protected internal override void LoadControlState (object savedState)
 		{
 			ResetDefaults ();
 			object[] state = savedState as object[];
@@ -1759,7 +1759,7 @@ namespace System.Web.UI.WebControls
 			return ret;
 		}
 		
-		protected override void OnInit (EventArgs e)
+		protected internal override void OnInit (EventArgs e)
 		{
 			Page.RegisterRequiresControlState (this);
 			base.OnInit (e);
@@ -1882,7 +1882,7 @@ namespace System.Web.UI.WebControls
 			InvokeEvent <PageEventArgs> (TotalRowCountAvailableEvent, e);
 		}
 	
-		protected override void PerformDataBinding (IEnumerable data)
+		protected internal override void PerformDataBinding (IEnumerable data)
 		{
 			base.PerformDataBinding (data);
 			TrackViewState ();
@@ -1923,7 +1923,7 @@ namespace System.Web.UI.WebControls
 				container.Controls.RemoveAt (start);
 		}
 		
-		protected override void Render (HtmlTextWriter writer)
+		protected internal override void Render (HtmlTextWriter writer)
 		{
 			base.Render (writer);
 			// Why override?
@@ -1952,7 +1952,7 @@ namespace System.Web.UI.WebControls
 			return state;
 		}
 		
-		protected override object SaveControlState ()
+		protected internal override object SaveControlState ()
 		{
 			object[] ret = new object [CSTATE_COUNT];
 			string[] dataKeyNames = DataKeyNames;

mcs/class/System.Web.Extensions/System.Web.UI/ExtenderControl.cs

@@ -84,7 +84,7 @@ namespace System.Web.UI
 
 		protected abstract IEnumerable<ScriptReference> GetScriptReferences ();
 
-		protected override void OnPreRender (EventArgs e) {
+		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 
 			if (String.IsNullOrEmpty (TargetControlID))
@@ -96,7 +96,7 @@ namespace System.Web.UI
 			ScriptManager.RegisterExtenderControl (this, c);
 		}
 
-		protected override void Render (HtmlTextWriter writer) {
+		protected internal override void Render (HtmlTextWriter writer) {
 			ScriptManager.RegisterScriptDescriptors (this);
 			base.Render (writer);
 		}

mcs/class/System.Web.Extensions/System.Web.UI/ScriptControl.cs

@@ -55,12 +55,12 @@ namespace System.Web.UI
 
 		protected abstract IEnumerable<ScriptReference> GetScriptReferences ();
 
-		protected override void OnPreRender (EventArgs e) {
+		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 			ScriptManager.RegisterScriptControl (this);
 		}
 
-		protected override void Render (HtmlTextWriter writer) {
+		protected internal override void Render (HtmlTextWriter writer) {
 			ScriptManager.RegisterScriptDescriptors (this);
 			base.Render (writer);
 		}

mcs/class/System.Web.Extensions/System.Web.UI/ScriptManager.cs

@@ -455,7 +455,7 @@ namespace System.Web.UI
 				AsyncPostBackError (this, e);
 		}
 
-		protected override void OnInit (EventArgs e) {
+		protected internal override void OnInit (EventArgs e) {
 			base.OnInit (e);
 
 			if (GetCurrentInternal (Page) != null)
@@ -471,7 +471,7 @@ namespace System.Web.UI
 				OnAsyncPostBackError (new AsyncPostBackErrorEventArgs (Context.Error));
 		}
 
-		protected override void OnPreRender (EventArgs e) {
+		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 
 			Page.PreRenderComplete += new EventHandler (OnPreRenderComplete);
@@ -1086,7 +1086,7 @@ namespace System.Web.UI
 			scriptList.Add (new RegisteredScript (control, type, key, script, url, addScriptTag, scriptType));
 		}
 
-		protected override void Render (HtmlTextWriter writer) {
+		protected internal override void Render (HtmlTextWriter writer) {
 			// MSDN: This method is used by control developers to extend the ScriptManager control. 
 			// Notes to Inheritors: 
 			// When overriding this method, call the base Render(HtmlTextWriter) method 

mcs/class/System.Web.Extensions/System.Web.UI/ScriptManagerProxy.cs

@@ -117,7 +117,7 @@ namespace System.Web.UI
 			}
 		}
 
-		protected override void OnInit (EventArgs e) {
+		protected internal override void OnInit (EventArgs e) {
 			base.OnInit (e);
 			ScriptManager.RegisterProxy (this);
 		}

mcs/class/System.Web.Extensions/System.Web.UI/Timer.cs

@@ -112,7 +112,7 @@ namespace System.Web.UI
 			yield return script;
 		}
 
-		protected override void OnPreRender (EventArgs e) {
+		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 			ScriptManager.RegisterScriptControl (this);
 		}
@@ -126,7 +126,7 @@ namespace System.Web.UI
 			OnTick (EventArgs.Empty);
 		}
 
-		protected override void Render (HtmlTextWriter writer) {
+		protected internal override void Render (HtmlTextWriter writer) {
 
 			Page.ClientScript.RegisterForEventValidation (UniqueID);
 

mcs/class/System.Web.Extensions/System.Web.UI/UpdatePanel.cs

@@ -242,7 +242,7 @@ namespace System.Web.UI
 				_triggers [i].Initialize ();
 		}
 
-		protected override void OnInit (EventArgs e) {
+		protected internal override void OnInit (EventArgs e) {
 			base.OnInit (e);
 
 			ScriptManager.RegisterUpdatePanel (this);
@@ -253,24 +253,24 @@ namespace System.Web.UI
 				ContentTemplate.InstantiateIn (ContentTemplateContainer);
 		}
 
-		protected override void OnLoad (EventArgs e) {
+		protected internal override void OnLoad (EventArgs e) {
 			base.OnLoad (e);
 
 			Initialize ();
 		}
 
-		protected override void OnPreRender (EventArgs e) {
+		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 
 			if (UpdateMode == UpdatePanelUpdateMode.Always && !ChildrenAsTriggers)
 				throw new InvalidOperationException (String.Format ("ChildrenAsTriggers cannot be set to false when UpdateMode is set to Always on UpdatePanel '{0}'", ID));
 		}
 
-		protected override void OnUnload (EventArgs e) {
+		protected internal override void OnUnload (EventArgs e) {
 			base.OnUnload (e);
 		}
 
-		protected override void Render (HtmlTextWriter writer) {
+		protected internal override void Render (HtmlTextWriter writer) {
 			writer.AddAttribute (HtmlTextWriterAttribute.Id, ClientID);
 			if (RenderMode == UpdatePanelRenderMode.Block)
 				writer.RenderBeginTag (HtmlTextWriterTag.Div);
@@ -294,7 +294,7 @@ namespace System.Web.UI
 			return null;
 		}
 		
-		protected override void RenderChildren (HtmlTextWriter writer)
+		protected internal override void RenderChildren (HtmlTextWriter writer)
 		{
 			RenderChildrenWriter = null;
 			

mcs/class/System.Web.Extensions/System.Web.UI/UpdateProgress.cs

@@ -126,7 +126,7 @@ namespace System.Web.UI
 			yield break;
 		}
 
-		protected override void OnPreRender (EventArgs e) {
+		protected internal override void OnPreRender (EventArgs e) {
 			base.OnPreRender (e);
 			ScriptManager.RegisterScriptControl (this);
 
@@ -138,7 +138,7 @@ namespace System.Web.UI
 			Controls.Add (container);
 		}
 
-		protected override void Render (HtmlTextWriter writer) {
+		protected internal override void Render (HtmlTextWriter writer) {
 			if (DynamicLayout)
 				writer.AddStyleAttribute (HtmlTextWriterStyle.Display, "none");
 			else {

mcs/class/System.Web/Assembly/AssemblyInfo.cs

@@ -94,7 +94,6 @@ using System.Web.UI;
 #endif
 
 [assembly: InternalsVisibleTo ("System.Web.Extensions, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-[assembly: InternalsVisibleTo ("System.Web.DynamicData, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 
 #endif