Kaynağa Gözat

2005-06-15 Lluis Sanchez Gual <[email protected]>

	* CodeSubDirectory.cs:
	* ExpressionBuilder.cs:
	* AssemblyInfo.cs:
	* BuildProviderCollection.cs:
	* ExpressionBuilderCollection.cs:
	* CodeSubDirectoriesCollection.cs:
	* AnonymousIdentificationSection.cs: Track 2.0 api changes
	in System.Configuration.


svn path=/trunk/mcs/; revision=46064
Lluis Sanchez 20 yıl önce
ebeveyn
işleme
25ebabf4e5

+ 2 - 2
mcs/class/System.Web/System.Web.Configuration/AnonymousIdentificationSection.cs

@@ -51,7 +51,7 @@ namespace System.Web.Configuration
 		
 		static AnonymousIdentificationSection ()
 		{
-			enabledProp = new ConfigurationProperty ("enabled", typeof(bool), false);
+/*			enabledProp = new ConfigurationProperty ("enabled", typeof(bool), false);
 			cookieNameProp = new NonEmptyStringConfigurationProperty ("cookieName", ".ASPXANONYMOUS", ConfigurationPropertyFlags.None);
 			cookieTimeoutProp = new TimeSpanConfigurationProperty ("cookieTimeout", new TimeSpan (69,10,40,0), TimeSpanSerializedFormat.Minutes, TimeSpanPropertyFlags.AllowInfinite | TimeSpanPropertyFlags.ProhibitZero, ConfigurationPropertyFlags.None);
 			cookiePathProp = new NonEmptyStringConfigurationProperty ("cookiePath", "/", ConfigurationPropertyFlags.None);
@@ -71,7 +71,7 @@ namespace System.Web.Configuration
 			properties.Add (cookieProtectionProp);
 			properties.Add (cookilessProp);
 			properties.Add (domainProp);
-		}
+*/		}
 		
 		public HttpCookieMode Cookiless {
 			get { return (HttpCookieMode) base [cookilessProp]; }

+ 2 - 2
mcs/class/System.Web/System.Web.Configuration/AssemblyInfo.cs

@@ -43,8 +43,8 @@ namespace System.Web.Configuration
 		static AssemblyInfo ()
 		{
 			properties = new ConfigurationPropertyCollection ();
-			assemblyProp = new NonEmptyStringConfigurationProperty ("assembly", null, ConfigurationPropertyFlags.IsKey);
-			properties.Add (assemblyProp);
+//			assemblyProp = new NonEmptyStringConfigurationProperty ("assembly", null, ConfigurationPropertyFlags.IsKey);
+//			properties.Add (assemblyProp);
 		}
 		
 		public AssemblyInfo ()

+ 4 - 5
mcs/class/System.Web/System.Web.Configuration/BuildProviderCollection.cs

@@ -43,6 +43,10 @@ namespace System.Web.Configuration
 			//FIXME: add properties
 			props = new ConfigurationPropertyCollection ();
 		}
+		
+		public BuildProviderCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
+		{
+		}
 
 		public BuildProvider this [int index] {
 			get { return (BuildProvider) BaseGet (index); }
@@ -82,11 +86,6 @@ namespace System.Web.Configuration
 			BaseRemoveAt (index);
 		}
 
-		protected override bool CompareKeys (object key1, object key2)
-		{
-			return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
-		}
-
 		protected override ConfigurationElement CreateNewElement ()
 		{
 			return new BuildProvider ();

+ 11 - 0
mcs/class/System.Web/System.Web.Configuration/ChangeLog

@@ -1,3 +1,14 @@
+2005-06-15  Lluis Sanchez Gual <[email protected]>
+
+	* CodeSubDirectory.cs:
+	* ExpressionBuilder.cs:
+	* AssemblyInfo.cs:
+	* BuildProviderCollection.cs:
+	* ExpressionBuilderCollection.cs:
+	* CodeSubDirectoriesCollection.cs:
+	* AnonymousIdentificationSection.cs: Track 2.0 api changes
+	in System.Configuration.
+
 2005-06-13 Gonzalo Paniagua Javier <[email protected]>
 
 	* GlobalizationConfigurationHandler.cs: when an attribute is not

+ 4 - 5
mcs/class/System.Web/System.Web.Configuration/CodeSubDirectoriesCollection.cs

@@ -43,6 +43,10 @@ namespace System.Web.Configuration
 			//FIXME: add properties
 			props = new ConfigurationPropertyCollection ();
 		}
+		
+		public CodeSubDirectoriesCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
+		{
+		}
 
 		public CodeSubDirectory this [int index] {
 			get { return (CodeSubDirectory) BaseGet (index); }
@@ -71,11 +75,6 @@ namespace System.Web.Configuration
 			BaseAdd (codeSubDirectory);
 		}
 
-		protected override bool CompareKeys (object key1, object key2)
-		{
-			return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
-		}
-
 		protected override ConfigurationElement CreateNewElement ()
 		{
 			return new CodeSubDirectory ();

+ 2 - 2
mcs/class/System.Web/System.Web.Configuration/CodeSubDirectory.cs

@@ -41,11 +41,11 @@ namespace System.Web.Configuration
 		static CodeSubDirectory ()
 		{
 			props = new ConfigurationPropertyCollection ();
-			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.IsKey | ConfigurationPropertyFlags.Required;
+/*			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.IsKey | ConfigurationPropertyFlags.Required;
 			NonEmptyStringFlags strFlags = NonEmptyStringFlags.TrimWhitespace;
 			ConfigurationProperty prop = new NonEmptyStringConfigurationProperty ("directoryName", "", flags, strFlags);
 			props.Add (prop);
-		}
+*/		}
 
 		public string DirectoryName {
 			get { return directoryName; }

+ 2 - 2
mcs/class/System.Web/System.Web.Configuration/ExpressionBuilder.cs

@@ -42,7 +42,7 @@ namespace System.Web.Configuration
 
 		static ExpressionBuilder ()
 		{
-			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.Required | ConfigurationPropertyFlags.IsKey;
+/*			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.Required | ConfigurationPropertyFlags.IsKey;
 			type = new NonEmptyStringConfigurationProperty ("type", "", flags);
 			flags = ConfigurationPropertyFlags.Required;
 			expressionPrefix = new NonEmptyStringConfigurationProperty ("expressionPrefix", "", flags);
@@ -50,7 +50,7 @@ namespace System.Web.Configuration
 			props = new ConfigurationPropertyCollection ();
 			props.Add (type);
 			props.Add (expressionPrefix);
-		}
+*/		}
 
 		public string ExpressionPrefix {
 			get { return (string) this [expressionPrefix]; }

+ 5 - 6
mcs/class/System.Web/System.Web.Configuration/ExpressionBuilderCollection.cs

@@ -41,10 +41,14 @@ namespace System.Web.Configuration
 		static ExpressionBuilderCollection ()
 		{
 			props = new ConfigurationPropertyCollection ();
-			ConfigurationPropertyFlags flags = ConfigurationPropertyFlags.DefaultCollection;
+			ConfigurationPropertyOptions flags = ConfigurationPropertyOptions.DefaultCollection;
 			ConfigurationProperty prop = new ConfigurationProperty (null, typeof (ExpressionBuilderCollection), null, flags);
 			props.Add (prop);
 		}
+		
+		public ExpressionBuilderCollection (): base (CaseInsensitiveComparer.DefaultInvariant)
+		{
+		}
 
 		public ExpressionBuilder this [int index] {
 			get { return (ExpressionBuilder) BaseGet (index); }
@@ -84,11 +88,6 @@ namespace System.Web.Configuration
 			BaseRemoveAt (index);
 		}
 
-		protected override bool CompareKeys (object key1, object key2)
-		{
-			return (0 == CaseInsensitiveComparer.DefaultInvariant.Compare ((string) key1, (string) key2));
-		}
-
 		protected override ConfigurationElement CreateNewElement ()
 		{
 			return new ExpressionBuilder ();