Imported Upstream version 4.0.0~alpha1

Former-commit-id: 806294f5ded97629b74c85c09952f2a74fe182d9

mcs/class/System.Web/System.Web.Caching/CacheDependency.cs

@@ -56,11 +56,7 @@ namespace System.Web.Caching
 			remove { events.RemoveHandler (dependencyChangedEvent, value); }
 		}
 
-#if NET_4_0
 		protected
-#else
-		public
-#endif
 		CacheDependency (): this (null, null, null, DateTime.Now)
 		{
 		}

mcs/class/System.Web/System.Web.Caching/CachedVaryBy.cs

@@ -39,9 +39,7 @@ using System.Web.Util;
 
 namespace System.Web.Caching
 {
-#if NET_4_0
 	[Serializable]
-#endif
 	sealed class CachedVaryBy
 	{
 		string[] prms;

mcs/class/System.Web/System.Web.Caching/OutputCacheModule.cs

@@ -50,20 +50,12 @@ namespace System.Web.Caching
 		Dictionary <string, string> keysCache;
 		Dictionary <string, string> entriesToInvalidate;
 		
-#if !NET_4_0
-		OutputCacheProvider provider;
-
-		internal OutputCacheProvider InternalProvider {
-			get { return provider; }
-		}
-#endif
 		public OutputCacheModule ()
 		{
 		}
 
 		OutputCacheProvider FindCacheProvider (HttpApplication app)
 		{				
-#if NET_4_0
 			HttpContext ctx = HttpContext.Current;
 			if (app == null) {
 				app = ctx != null ? ctx.ApplicationInstance : null;
@@ -81,12 +73,6 @@ namespace System.Web.Caching
 				throw new ProviderException (String.Format ("OutputCacheProvider named '{0}' cannot be found.", providerName));
 
 			return ret;
-#else
-			if (provider == null)
-				provider = new InMemoryOutputCacheProvider ();
-			
-			return provider;
-#endif
 		}
 		
 		public void Dispose ()

mcs/class/System.Web/System.Web.Caching/OutputCacheProvider.cs

@@ -30,9 +30,7 @@ using System.Configuration.Provider;
 
 namespace System.Web.Caching
 {
-#if NET_4_0
 	public 
-#endif
 	abstract class OutputCacheProvider : ProviderBase
 	{
 		protected OutputCacheProvider ()

mcs/class/System.Web/System.Web.Caching/SqlCacheDependency.cs

@@ -56,7 +56,6 @@ namespace System.Web.Caching
 				throw new ArgumentNullException ("tableName");
 		}
 
-#if NET_4_0
 		[MonoTODO ("Needs more testing - especially the return value and database+table lookup.")]
 		public static CacheDependency CreateOutputCacheDependency (string dependency)
 		{
@@ -100,7 +99,6 @@ For SQL Server 7.0 and SQL Server 2000, the valid format is ""database:tablename
 
 For dependencies that use SQL Server 9.0 notifications, specify the value 'CommandNotification'.", dependency);
 		}
-#endif
 		
 		protected override void DependencyDispose ()
 		{