Fixed more protected internal modifiers

diff --git a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
index a3d825b15277c78f0ed59e425948bc2448585887..38ff0e1ac9b23a95637ba0d9541712f3036b2eae 100644 (file)
--- a/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
+++ b/mcs/class/System.Web.Extensions/Assembly/AssemblyInfo.cs
@@ -64,9 +64,6 @@ using System.Security.Permissions;
        [assembly: AssemblyDelaySign (true)]
        [assembly: AssemblyKeyFile ("../winfx.pub")]
 
-#if NET_2_0
-[assembly: InternalsVisibleTo ("System.Web.Extensions_test_net_2_0, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
-#endif
 #endif
 
 [assembly: ComVisible (false)]

diff --git a/mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptReferenceBaseTest.cs b/mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptReferenceBaseTest.cs
index 89cdbdaca04fbd2807452998114e87329acf8690..adb502fcb773a1e3337dc99ba6320944c7723e65 100644 (file)
--- a/mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptReferenceBaseTest.cs
+++ b/mcs/class/System.Web.Extensions/Test/System.Web.UI/ScriptReferenceBaseTest.cs
@@ -37,12 +37,12 @@ namespace MonoTests.System.Web.UI
 {
        class MyScriptReference : ScriptReferenceBase
        {
-               protected internal override string GetUrl (ScriptManager scriptManager, bool zip)
+               protected override string GetUrl (ScriptManager scriptManager, bool zip)
                {
                        return null;
                }
        
-               protected internal override bool IsFromSystemWebExtensions ()
+               protected override bool IsFromSystemWebExtensions ()
                {
                        return false;
                }

diff --git a/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs b/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
index 454f8309a5987736fee2634b4d36b47a1cd10db5..a549dd5825fc99ac0574b5484028dc6558422192 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.Compilation/RouteUrlExpressionBuilderTest.cs
@@ -44,7 +44,6 @@ using MonoTests.Common;
 
 namespace MonoTests.System.Web.Compilation
 {
-#if NET_4_0
        [TestFixture]
        public class RouteUrlExpressionBuilderTest
        {
@@ -272,7 +271,7 @@ namespace MonoTests.System.Web.Compilation
                private HttpContext ctx;
 
                // don't call base class (so _context is never set to a non-null value)
-               protected override HttpContext Context
+               protected internal override HttpContext Context
                {
                        get
                        {
@@ -286,6 +285,5 @@ namespace MonoTests.System.Web.Compilation
                        }
                }
        }
-#endif
 }
-#endif
\ No newline at end of file
+#endif

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
index 2d56a4d124d4f8ccea65d72598605eeb720ef056..6fde3781cb33f4e989686f9c89e1d355daf47bd1 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/ObjectDataSourceViewTest.cs
@@ -924,6 +924,9 @@ namespace MonoTests.System.Web.UI.WebControls
                                evaluateCount = 0;
                        }
 
+#if NET_4_0
+                       internal
+#endif
                        protected override object Evaluate (HttpContext context, Control control) 
                        {
                                evaluateCount++;

diff --git a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
index d81c16f194cf06f81b144705ec73668cf3fb0991..fa2642cff8828124fcd19a90f25cc38bccbadecd 100644 (file)
--- a/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
+++ b/mcs/class/System.Web/Test/System.Web.UI.WebControls/SqlDataSourceViewTest.cs
@@ -453,6 +453,9 @@ namespace MonoTests.System.Web.UI.WebControls
                                evaluateCount = 0;
                        }
 
+#if NET_4_0
+                       internal
+#endif
                        protected override object Evaluate (HttpContext context, Control control) {
                                evaluateCount++;
                                return String.Format ("{0}{1}", DefaultValue, evaluateCount);

diff --git a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyTemplateControls.cs b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyTemplateControls.cs
index edd0a5d8e468a61cb94ad547281150775426fc54..6f0556b28cb533b29500d653b188bcfb4cb118e5 100644 (file)
--- a/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyTemplateControls.cs
+++ b/mcs/class/System.Web/Test/mainsoft/NunitWeb/NunitWeb/MyTemplateControls.cs
@@ -36,7 +36,7 @@ namespace MyTemplateControls
       container = new TestContainerControl (this);
     }
 
-    protected internal override void CreateChildControls ()
+    protected override void CreateChildControls ()
     {
       Controls.Clear ();
       container.AddItem ();