Author: krasnov
Date: 2006-11-05 07:42:51 -0500 (Sun, 05 Nov 2006)
New Revision: 67370
Added:
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationRemoveElement.cs
Modified:
trunk/mcs/class/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/System.Configuration.dll.sources
trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettingsCollection.cs
trunk/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
trunk/mcs/class/System.Configuration/Test/standalone/ChangeLog
trunk/mcs/class/System.Configuration/Test/standalone/t37.cs
trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.config
trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.expected
Log:
* System.Configuration.dll.sources, System.Configuration20.vmwcsproj: added
ConfigurationRemoveElement.cs
* added: ConfigurationRemoveElement.cs, common element for <remove>
* ConnectionStringSettingsCollection.cs: reverted last fix for <remove> element
* ConfigurationElementCollection.cs: fixed the way that
OnDeserializeUnrecognizedElement method handles <remove> element
* t37.cs, t37.exe.config, t37.exe.expected: added some tests for <remove>
element
Modified: trunk/mcs/class/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/ChangeLog 2006-11-05 11:53:45 UTC
(rev 67369)
+++ trunk/mcs/class/System.Configuration/ChangeLog 2006-11-05 12:42:51 UTC
(rev 67370)
@@ -1,16 +1,21 @@
-2006-09-26 Boris Kirzner <[EMAIL PROTECTED]>
+2006-11-05 Vladimir Krasnov <[EMAIL PROTECTED]>
+ * System.Configuration.dll.sources, System.Configuration20.vmwcsproj:
+ added ConfigurationRemoveElement.cs
+
+2006-09-26 Boris Kirzner <[EMAIL PROTECTED]>
+
* run-tests.test.bat : log files naming fix.
-2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
+2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
* run-tests.test.bat : small fixes for TARGET_JVM.
-2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
+2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
* run-tests.test.bat : small fixes for TARGET_JVM.
-2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
+2006-05-09 Boris Kirzner <[EMAIL PROTECTED]>
* run-tests.bat, run-tests.test.bat: added scripts for NET_2_0
TARGET_JVM tests.
Modified: trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2006-11-05 11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/System.Configuration/ChangeLog
2006-11-05 12:42:51 UTC (rev 67370)
@@ -1,3 +1,11 @@
+2006-11-05 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * added: ConfigurationRemoveElement.cs, common element for <remove>
+ * ConnectionStringSettingsCollection.cs: reverted last fix for
+ <remove> element
+ * ConfigurationElementCollection.cs: fixed the way that
+ OnDeserializeUnrecognizedElement method handles <remove> element
+
2006-11-02 Vladimir Krasnov <[EMAIL PROTECTED]>
* ConfigurationElement.cs: typo in DefaultCollectionProperty
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
2006-11-05 11:53:45 UTC (rev 67369)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationElementCollection.cs
2006-11-05 12:42:51 UTC (rev 67370)
@@ -475,9 +475,10 @@
return true;
}
else if (elementName == removeElementName) {
- ConfigurationElement elem =
CreateNewElementInternal (removeElementName);
- elem.DeserializeElement (reader, true);
- BaseRemove (GetElementKey (elem));
+ ConfigurationElement elem =
CreateNewElementInternal (null);
+ ConfigurationRemoveElement removeElem =
new ConfigurationRemoveElement (elem);
+ removeElem.DeserializeElement (reader,
true);
+ BaseRemove (removeElem.KeyValue);
modified = false;
return true;
}
Added:
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationRemoveElement.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationRemoveElement.cs
2006-11-05 11:53:45 UTC (rev 67369)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ConfigurationRemoveElement.cs
2006-11-05 12:42:51 UTC (rev 67370)
@@ -0,0 +1,64 @@
+//
+// System.Configuration.ConfigurationPropertyOptions.cs
+//
+// Authors:
+// Vladimir Krasnov ([EMAIL PROTECTED])
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+// Copyright (C) 2004 Novell, Inc (http://www.novell.com)
+//
+
+#if NET_2_0
+
+using System;
+using System.ComponentModel;
+using System.Configuration;
+
+namespace System.Configuration
+{
+ internal sealed class ConfigurationRemoveElement : ConfigurationElement
+ {
+ ConfigurationPropertyCollection properties = new
ConfigurationPropertyCollection();
+ string _name = "";
+
+ internal ConfigurationRemoveElement (ConfigurationElement
origElement)
+ {
+ foreach (ConfigurationProperty p in
origElement.Properties)
+ if (p.IsKey)
+ {
+ properties.Add(p);
+ _name = p.Name;
+ }
+ }
+
+ internal object KeyValue
+ {
+ get { return base [_name]; }
+ }
+
+ protected internal override ConfigurationPropertyCollection
Properties
+ {
+ get { return properties; }
+ }
+ }
+}
+
+#endif
\ No newline at end of file
Modified:
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettingsCollection.cs
===================================================================
---
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettingsCollection.cs
2006-11-05 11:53:45 UTC (rev 67369)
+++
trunk/mcs/class/System.Configuration/System.Configuration/ConnectionStringSettingsCollection.cs
2006-11-05 12:42:51 UTC (rev 67370)
@@ -78,19 +78,8 @@
return new ConnectionStringSettings ();
}
- protected override ConfigurationElement CreateNewElement
(string elementName)
- {
- if (elementName == RemoveElementName)
- return new NameValueConfigurationElement
(null, null);
-
- return base.CreateNewElement (elementName);
- }
-
protected override object GetElementKey (ConfigurationElement
element)
{
- if (element is NameValueConfigurationElement)
- return ((NameValueConfigurationElement)
element).Name;
-
return ((ConnectionStringSettings) element).Name;
}
Modified: trunk/mcs/class/System.Configuration/System.Configuration.dll.sources
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration.dll.sources
2006-11-05 11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/System.Configuration.dll.sources
2006-11-05 12:42:51 UTC (rev 67370)
@@ -48,6 +48,7 @@
System.Configuration/ConfigurationPropertyAttribute.cs
System.Configuration/ConfigurationPropertyCollection.cs
System.Configuration/ConfigurationPropertyOptions.cs
+System.Configuration/ConfigurationRemoveElement.cs
System.Configuration/ConfigurationSaveMode.cs
System.Configuration/ConfigurationSection.cs
System.Configuration/ConfigurationSectionCollection.cs
Modified: trunk/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
===================================================================
--- trunk/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
2006-11-05 11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
2006-11-05 12:42:51 UTC (rev 67370)
@@ -1,247 +1,248 @@
-<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
- <PropertyGroup>
- <Configuration Condition=" '$(Configuration)' == ''
">Debug_Java</Configuration>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>8.0.50727</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
-
<ProjectGuid>{7262AA8D-840C-4123-B99E-180F64F13A76}</ProjectGuid>
- <OutputType>Library</OutputType>
- <AppDesignerFolder>Properties</AppDesignerFolder>
- <RootNamespace>System.Configuration</RootNamespace>
- <AssemblyName>System.Configuration</AssemblyName>
- <JDKName>1.5.0_05</JDKName>
- <GHProjectType>1</GHProjectType>
- <Version>2.0</Version>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release_Java20|AnyCPU' ">
- <OutputPath>bin\Release_Java20\</OutputPath>
-
<DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <Optimize>true</Optimize>
- <NoStdLib>false</NoStdLib>
- <DebugType>pdbonly</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <SkipValidation>false</SkipValidation>
- <KeepIntermediate>false</KeepIntermediate>
- <GHProjectType>1</GHProjectType>
- <PreCompile>false</PreCompile>
- <AdditionalClassPath>
- </AdditionalClassPath>
- <ApplicationServerType>
- </ApplicationServerType>
- <Version>2.0</Version>
- <JDKName>1.5.0_05</JDKName>
- <TargetPlatform>0</TargetPlatform>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Debug_Java20|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Debug_Java20\</OutputPath>
-
<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <DebugType>full</DebugType>
- <PlatformTarget>AnyCPU</PlatformTarget>
- <ErrorReport>prompt</ErrorReport>
- <SkipValidation>True</SkipValidation>
- <KeepIntermediate>False</KeepIntermediate>
- <GHProjectType>1</GHProjectType>
- <PreCompile>false</PreCompile>
- <AdditionalClassPath>
- </AdditionalClassPath>
- <ApplicationServerType>
- </ApplicationServerType>
- <Version>2.0</Version>
- <JDKName>1.5.0_05</JDKName>
- <TargetPlatform>0</TargetPlatform>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Debug_Java|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug_Java\</OutputPath>
-
<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <BaseAddress>285212672</BaseAddress>
- <NoStdLib>false</NoStdLib>
- <SkipValidation>True</SkipValidation>
- <KeepIntermediate>False</KeepIntermediate>
- <TargetPlatform>0</TargetPlatform>
- <AdditionalClassPath>
- </AdditionalClassPath>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release_Java|AnyCPU' ">
- <DebugType>pdbonly</DebugType>
- <Optimize>true</Optimize>
- <OutputPath>bin\Release_Java\</OutputPath>
-
<DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <BaseAddress>285212672</BaseAddress>
- <NoStdLib>false</NoStdLib>
- <SkipValidation>false</SkipValidation>
- <KeepIntermediate>false</KeepIntermediate>
- <TargetPlatform>0</TargetPlatform>
- <AdditionalClassPath>
- </AdditionalClassPath>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="J2SE.Helpers, Version=0.0.0.0,
Culture=neutral">
- <HintPath>..\lib\J2SE.Helpers.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="rt, Version=0.0.0.0, Culture=neutral">
- <HintPath>..\lib\rt.dll</HintPath>
- <Private>False</Private>
- </Reference>
- <Reference Include="System"/>
- <Reference Include="System.XML"/>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\..\build\common\Locale.cs">
- <Link>Locale.cs</Link>
- </Compile>
- <Compile Include="Assembly\AssemblyInfo.cs"/>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="..\..\build\common\Consts.cs.in">
- <Link>Consts.cs.in</Link>
- </Compile>
- <Compile Include="..\..\build\common\MonoTODOAttribute.cs">
- <Link>MonoTODOAttribute.cs</Link>
- </Compile>
- <Compile
Include="System.Configuration.Internal\DelegatingConfigHost.cs"/>
- <Compile
Include="System.Configuration.Internal\IConfigErrorInfo.cs"/>
- <Compile
Include="System.Configuration.Internal\IConfigSystem.cs"/>
- <Compile
Include="System.Configuration.Internal\IConfigurationManagerHelper.cs"/>
- <Compile
Include="System.Configuration.Internal\IConfigurationManagerInternal.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigClientHost.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigConfigurationFactory.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigHost.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigRecord.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigRoot.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigSettingsFactory.cs"/>
- <Compile
Include="System.Configuration.Internal\IInternalConfigSystem.cs"/>
- <Compile
Include="System.Configuration.Internal\InternalConfigEventArgs.cs"/>
- <Compile
Include="System.Configuration.Internal\InternalConfigEventHandler.cs"/>
- <Compile
Include="System.Configuration.Internal\StreamChangeCallback.cs"/>
- <Compile
Include="System.Configuration.Provider\ProviderBase.cs"/>
- <Compile
Include="System.Configuration.Provider\ProviderCollection.cs"/>
- <Compile
Include="System.Configuration.Provider\ProviderException.cs"/>
- <Compile Include="System.Configuration\AppSettingsSection.cs"/>
- <Compile Include="System.Configuration\CallbackValidator.cs"/>
- <Compile
Include="System.Configuration\CallbackValidatorAttribute.cs"/>
- <Compile
Include="System.Configuration\ClientConfigurationSystem.cs"/>
- <Compile
Include="System.Configuration\CommaDelimitedStringCollection.cs"/>
- <Compile
Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs"/>
- <Compile Include="System.Configuration\ConfigHelper.cs"/>
- <Compile Include="System.Configuration\ConfigInfo.cs"/>
- <Compile Include="System.Configuration\Configuration.cs"/>
- <Compile
Include="System.Configuration\ConfigurationAllowDefinition.cs"/>
- <Compile
Include="System.Configuration\ConfigurationAllowExeDefinition.cs"/>
- <Compile
Include="System.Configuration\ConfigurationCollectionAttribute.cs"/>
- <Compile
Include="System.Configuration\ConfigurationConverterBase.cs"/>
- <Compile
Include="System.Configuration\ConfigurationElement.cs"/>
- <Compile
Include="System.Configuration\ConfigurationElementCollection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationElementCollectionType.cs"/>
- <Compile
Include="System.Configuration\ConfigurationElementProperty.cs"/>
- <Compile
Include="System.Configuration\ConfigurationErrorsException.cs"/>
- <Compile
Include="System.Configuration\ConfigurationFileMap.cs"/>
- <Compile
Include="System.Configuration\ConfigurationLocation.cs"/>
- <Compile
Include="System.Configuration\ConfigurationLocationCollection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationLockCollection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationManager.cs"/>
- <Compile
Include="System.Configuration\ConfigurationPermission.cs"/>
- <Compile
Include="System.Configuration\ConfigurationPermissionAttribute.cs"/>
- <Compile
Include="System.Configuration\ConfigurationProperty.cs"/>
- <Compile
Include="System.Configuration\ConfigurationPropertyAttribute.cs"/>
- <Compile
Include="System.Configuration\ConfigurationPropertyCollection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationPropertyOptions.cs"/>
- <Compile
Include="System.Configuration\ConfigurationSaveMode.cs"/>
- <Compile
Include="System.Configuration\ConfigurationSection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationSectionCollection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationSectionGroup.cs"/>
- <Compile
Include="System.Configuration\ConfigurationSectionGroupCollection.cs"/>
- <Compile
Include="System.Configuration\ConfigurationUserLevel.cs"/>
- <Compile
Include="System.Configuration\ConfigurationValidatorAttribute.cs"/>
- <Compile
Include="System.Configuration\ConfigurationValidatorBase.cs"/>
- <Compile
Include="System.Configuration\ConnectionStringSettings.cs"/>
- <Compile
Include="System.Configuration\ConnectionStringSettingsCollection.cs"/>
- <Compile
Include="System.Configuration\ConnectionStringsSection.cs"/>
- <Compile Include="System.Configuration\ContextInformation.cs"/>
- <Compile Include="System.Configuration\DefaultSection.cs"/>
- <Compile Include="System.Configuration\DefaultValidator.cs"/>
- <Compile
Include="System.Configuration\DpapiProtectedConfigurationProvider.cs"/>
- <Compile Include="System.Configuration\ElementInformation.cs"/>
- <Compile
Include="System.Configuration\ExeConfigurationFileMap.cs"/>
- <Compile Include="System.Configuration\ExeContext.cs"/>
- <Compile
Include="System.Configuration\GenericEnumConverter.cs"/>
- <Compile Include="System.Configuration\IConfigXmlNode.cs"/>
- <Compile Include="System.Configuration\IgnoreSection.cs"/>
- <Compile
Include="System.Configuration\InfiniteIntConverter.cs"/>
- <Compile
Include="System.Configuration\InfiniteTimeSpanConverter.cs"/>
- <Compile Include="System.Configuration\IntegerValidator.cs"/>
- <Compile
Include="System.Configuration\IntegerValidatorAttribute.cs"/>
- <Compile
Include="System.Configuration\InternalConfigurationFactory.cs"/>
- <Compile
Include="System.Configuration\InternalConfigurationHost.cs"/>
- <Compile
Include="System.Configuration\InternalConfigurationRoot.cs"/>
- <Compile
Include="System.Configuration\KeyValueConfigurationCollection.cs"/>
- <Compile
Include="System.Configuration\KeyValueConfigurationElement.cs"/>
- <Compile
Include="System.Configuration\KeyValueInternalCollection.cs"/>
- <Compile Include="System.Configuration\LongValidator.cs"/>
- <Compile
Include="System.Configuration\LongValidatorAttribute.cs"/>
- <Compile
Include="System.Configuration\NameValueConfigurationCollection.cs"/>
- <Compile
Include="System.Configuration\NameValueConfigurationElement.cs"/>
- <Compile Include="System.Configuration\NonEmptyStringFlags.cs"/>
- <Compile Include="System.Configuration\PathLevel.cs"/>
- <Compile
Include="System.Configuration\PositiveTimeSpanValidator.cs"/>
- <Compile
Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs"/>
- <Compile Include="System.Configuration\PropertyInformation.cs"/>
- <Compile
Include="System.Configuration\PropertyInformationCollection.cs"/>
- <Compile Include="System.Configuration\PropertyValueOrigin.cs"/>
- <Compile
Include="System.Configuration\ProtectedConfiguration.cs"/>
- <Compile
Include="System.Configuration\ProtectedConfigurationProvider.cs"/>
- <Compile
Include="System.Configuration\ProtectedConfigurationProviderCollection.cs"/>
- <Compile
Include="System.Configuration\ProtectedConfigurationSection.cs"/>
- <Compile
Include="System.Configuration\ProtectedProviderSettings.cs"/>
- <Compile Include="System.Configuration\ProviderSettings.cs"/>
- <Compile
Include="System.Configuration\ProviderSettingsCollection.cs"/>
- <Compile
Include="System.Configuration\RegexStringValidator.cs"/>
- <Compile
Include="System.Configuration\RegexStringValidatorAttribute.cs"/>
- <Compile Include="System.Configuration\SectionGroupInfo.cs"/>
- <Compile Include="System.Configuration\SectionInfo.cs"/>
- <Compile Include="System.Configuration\SectionInformation.cs"/>
- <Compile Include="System.Configuration\StringValidator.cs"/>
- <Compile
Include="System.Configuration\StringValidatorAttribute.cs"/>
- <Compile
Include="System.Configuration\SubclassTypeValidator.cs"/>
- <Compile
Include="System.Configuration\SubclassTypeValidatorAttribute.cs"/>
- <Compile
Include="System.Configuration\TimeSpanMinutesConverter.cs"/>
- <Compile
Include="System.Configuration\TimeSpanMinutesOrInfiniteConverter.cs"/>
- <Compile
Include="System.Configuration\TimeSpanPropertyFlags.cs"/>
- <Compile
Include="System.Configuration\TimeSpanSecondsConverter.cs"/>
- <Compile
Include="System.Configuration\TimeSpanSecondsOrInfiniteConverter.cs"/>
- <Compile
Include="System.Configuration\TimeSpanSerializedFormat.cs"/>
- <Compile Include="System.Configuration\TimeSpanValidator.cs"/>
- <Compile
Include="System.Configuration\TimeSpanValidatorAttribute.cs"/>
- <Compile Include="System.Configuration\TypeNameConverter.cs"/>
- <Compile Include="System.Configuration\ValidatorCallback.cs"/>
- <Compile
Include="System.Configuration\WhiteSpaceTrimStringConverter.cs"/>
- </ItemGroup>
- <ItemGroup>
- <Folder Include="Properties\"/>
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
- <Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>
- <!-- To modify your build process, add your task inside one of the
targets below and uncomment it.
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == ''
">Debug_Java</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+
<ProjectGuid>{7262AA8D-840C-4123-B99E-180F64F13A76}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>System.Configuration</RootNamespace>
+ <AssemblyName>System.Configuration</AssemblyName>
+ <JDKName>1.5.0_05</JDKName>
+ <GHProjectType>1</GHProjectType>
+ <Version>2.0</Version>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release_Java20|AnyCPU' ">
+ <OutputPath>bin\Release_Java20\</OutputPath>
+
<DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <Optimize>true</Optimize>
+ <NoStdLib>false</NoStdLib>
+ <DebugType>pdbonly</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <SkipValidation>false</SkipValidation>
+ <KeepIntermediate>false</KeepIntermediate>
+ <GHProjectType>1</GHProjectType>
+ <PreCompile>false</PreCompile>
+ <AdditionalClassPath>
+ </AdditionalClassPath>
+ <ApplicationServerType>
+ </ApplicationServerType>
+ <Version>2.0</Version>
+ <JDKName>1.5.0_05</JDKName>
+ <TargetPlatform>0</TargetPlatform>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Debug_Java20|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <OutputPath>bin\Debug_Java20\</OutputPath>
+
<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
+ <BaseAddress>285212672</BaseAddress>
+ <DebugType>full</DebugType>
+ <PlatformTarget>AnyCPU</PlatformTarget>
+ <ErrorReport>prompt</ErrorReport>
+ <SkipValidation>True</SkipValidation>
+ <KeepIntermediate>False</KeepIntermediate>
+ <GHProjectType>1</GHProjectType>
+ <PreCompile>false</PreCompile>
+ <AdditionalClassPath>
+ </AdditionalClassPath>
+ <ApplicationServerType>
+ </ApplicationServerType>
+ <Version>2.0</Version>
+ <JDKName>1.5.0_05</JDKName>
+ <TargetPlatform>0</TargetPlatform>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Debug_Java|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug_Java\</OutputPath>
+
<DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <BaseAddress>285212672</BaseAddress>
+ <NoStdLib>false</NoStdLib>
+ <SkipValidation>True</SkipValidation>
+ <KeepIntermediate>False</KeepIntermediate>
+ <TargetPlatform>0</TargetPlatform>
+ <AdditionalClassPath>
+ </AdditionalClassPath>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release_Java|AnyCPU' ">
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>bin\Release_Java\</OutputPath>
+
<DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <BaseAddress>285212672</BaseAddress>
+ <NoStdLib>false</NoStdLib>
+ <SkipValidation>false</SkipValidation>
+ <KeepIntermediate>false</KeepIntermediate>
+ <TargetPlatform>0</TargetPlatform>
+ <AdditionalClassPath>
+ </AdditionalClassPath>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="J2SE.Helpers, Version=0.0.0.0,
Culture=neutral">
+ <HintPath>..\lib\J2SE.Helpers.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="rt, Version=0.0.0.0, Culture=neutral">
+ <HintPath>..\lib\rt.dll</HintPath>
+ <Private>False</Private>
+ </Reference>
+ <Reference Include="System"/>
+ <Reference Include="System.XML"/>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\build\common\Locale.cs">
+ <Link>Locale.cs</Link>
+ </Compile>
+ <Compile Include="Assembly\AssemblyInfo.cs"/>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="..\..\build\common\Consts.cs.in">
+ <Link>Consts.cs.in</Link>
+ </Compile>
+ <Compile Include="..\..\build\common\MonoTODOAttribute.cs">
+ <Link>MonoTODOAttribute.cs</Link>
+ </Compile>
+ <Compile
Include="System.Configuration.Internal\DelegatingConfigHost.cs"/>
+ <Compile
Include="System.Configuration.Internal\IConfigErrorInfo.cs"/>
+ <Compile
Include="System.Configuration.Internal\IConfigSystem.cs"/>
+ <Compile
Include="System.Configuration.Internal\IConfigurationManagerHelper.cs"/>
+ <Compile
Include="System.Configuration.Internal\IConfigurationManagerInternal.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigClientHost.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigConfigurationFactory.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigHost.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigRecord.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigRoot.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigSettingsFactory.cs"/>
+ <Compile
Include="System.Configuration.Internal\IInternalConfigSystem.cs"/>
+ <Compile
Include="System.Configuration.Internal\InternalConfigEventArgs.cs"/>
+ <Compile
Include="System.Configuration.Internal\InternalConfigEventHandler.cs"/>
+ <Compile
Include="System.Configuration.Internal\StreamChangeCallback.cs"/>
+ <Compile
Include="System.Configuration.Provider\ProviderBase.cs"/>
+ <Compile
Include="System.Configuration.Provider\ProviderCollection.cs"/>
+ <Compile
Include="System.Configuration.Provider\ProviderException.cs"/>
+ <Compile Include="System.Configuration\AppSettingsSection.cs"/>
+ <Compile Include="System.Configuration\CallbackValidator.cs"/>
+ <Compile
Include="System.Configuration\CallbackValidatorAttribute.cs"/>
+ <Compile
Include="System.Configuration\ClientConfigurationSystem.cs"/>
+ <Compile
Include="System.Configuration\CommaDelimitedStringCollection.cs"/>
+ <Compile
Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs"/>
+ <Compile Include="System.Configuration\ConfigHelper.cs"/>
+ <Compile Include="System.Configuration\ConfigInfo.cs"/>
+ <Compile Include="System.Configuration\Configuration.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationAllowDefinition.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationAllowExeDefinition.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationCollectionAttribute.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationConverterBase.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationElement.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationElementCollection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationElementCollectionType.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationElementProperty.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationErrorsException.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationFileMap.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationLocation.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationLocationCollection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationLockCollection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationManager.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationPermission.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationPermissionAttribute.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationProperty.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationPropertyAttribute.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationPropertyCollection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationPropertyOptions.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationRemoveElement.cs" />
+ <Compile
Include="System.Configuration\ConfigurationSaveMode.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationSection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationSectionCollection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationSectionGroup.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationSectionGroupCollection.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationUserLevel.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationValidatorAttribute.cs"/>
+ <Compile
Include="System.Configuration\ConfigurationValidatorBase.cs"/>
+ <Compile
Include="System.Configuration\ConnectionStringSettings.cs"/>
+ <Compile
Include="System.Configuration\ConnectionStringSettingsCollection.cs"/>
+ <Compile
Include="System.Configuration\ConnectionStringsSection.cs"/>
+ <Compile Include="System.Configuration\ContextInformation.cs"/>
+ <Compile Include="System.Configuration\DefaultSection.cs"/>
+ <Compile Include="System.Configuration\DefaultValidator.cs"/>
+ <Compile
Include="System.Configuration\DpapiProtectedConfigurationProvider.cs"/>
+ <Compile Include="System.Configuration\ElementInformation.cs"/>
+ <Compile
Include="System.Configuration\ExeConfigurationFileMap.cs"/>
+ <Compile Include="System.Configuration\ExeContext.cs"/>
+ <Compile
Include="System.Configuration\GenericEnumConverter.cs"/>
+ <Compile Include="System.Configuration\IConfigXmlNode.cs"/>
+ <Compile Include="System.Configuration\IgnoreSection.cs"/>
+ <Compile
Include="System.Configuration\InfiniteIntConverter.cs"/>
+ <Compile
Include="System.Configuration\InfiniteTimeSpanConverter.cs"/>
+ <Compile Include="System.Configuration\IntegerValidator.cs"/>
+ <Compile
Include="System.Configuration\IntegerValidatorAttribute.cs"/>
+ <Compile
Include="System.Configuration\InternalConfigurationFactory.cs"/>
+ <Compile
Include="System.Configuration\InternalConfigurationHost.cs"/>
+ <Compile
Include="System.Configuration\InternalConfigurationRoot.cs"/>
+ <Compile
Include="System.Configuration\KeyValueConfigurationCollection.cs"/>
+ <Compile
Include="System.Configuration\KeyValueConfigurationElement.cs"/>
+ <Compile
Include="System.Configuration\KeyValueInternalCollection.cs"/>
+ <Compile Include="System.Configuration\LongValidator.cs"/>
+ <Compile
Include="System.Configuration\LongValidatorAttribute.cs"/>
+ <Compile
Include="System.Configuration\NameValueConfigurationCollection.cs"/>
+ <Compile
Include="System.Configuration\NameValueConfigurationElement.cs"/>
+ <Compile Include="System.Configuration\NonEmptyStringFlags.cs"/>
+ <Compile Include="System.Configuration\PathLevel.cs"/>
+ <Compile
Include="System.Configuration\PositiveTimeSpanValidator.cs"/>
+ <Compile
Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs"/>
+ <Compile Include="System.Configuration\PropertyInformation.cs"/>
+ <Compile
Include="System.Configuration\PropertyInformationCollection.cs"/>
+ <Compile Include="System.Configuration\PropertyValueOrigin.cs"/>
+ <Compile
Include="System.Configuration\ProtectedConfiguration.cs"/>
+ <Compile
Include="System.Configuration\ProtectedConfigurationProvider.cs"/>
+ <Compile
Include="System.Configuration\ProtectedConfigurationProviderCollection.cs"/>
+ <Compile
Include="System.Configuration\ProtectedConfigurationSection.cs"/>
+ <Compile
Include="System.Configuration\ProtectedProviderSettings.cs"/>
+ <Compile Include="System.Configuration\ProviderSettings.cs"/>
+ <Compile
Include="System.Configuration\ProviderSettingsCollection.cs"/>
+ <Compile
Include="System.Configuration\RegexStringValidator.cs"/>
+ <Compile
Include="System.Configuration\RegexStringValidatorAttribute.cs"/>
+ <Compile Include="System.Configuration\SectionGroupInfo.cs"/>
+ <Compile Include="System.Configuration\SectionInfo.cs"/>
+ <Compile Include="System.Configuration\SectionInformation.cs"/>
+ <Compile Include="System.Configuration\StringValidator.cs"/>
+ <Compile
Include="System.Configuration\StringValidatorAttribute.cs"/>
+ <Compile
Include="System.Configuration\SubclassTypeValidator.cs"/>
+ <Compile
Include="System.Configuration\SubclassTypeValidatorAttribute.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanMinutesConverter.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanMinutesOrInfiniteConverter.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanPropertyFlags.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanSecondsConverter.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanSecondsOrInfiniteConverter.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanSerializedFormat.cs"/>
+ <Compile Include="System.Configuration\TimeSpanValidator.cs"/>
+ <Compile
Include="System.Configuration\TimeSpanValidatorAttribute.cs"/>
+ <Compile Include="System.Configuration\TypeNameConverter.cs"/>
+ <Compile Include="System.Configuration\ValidatorCallback.cs"/>
+ <Compile
Include="System.Configuration\WhiteSpaceTrimStringConverter.cs"/>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Properties\"/>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>
+ <Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>
+ <!-- To modify your build process, add your task inside one of the
targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
- -->
- <ProjectExtensions>
- <VisualStudio>
- <UserProperties
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-rt="..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar"
REFS-JarPath-system-xml="..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-system="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-j2se-helpers="..\lib\J2SE.Helpers.jar"/>
- </VisualStudio>
- </ProjectExtensions>
-</Project>
+ -->
+ <ProjectExtensions>
+ <VisualStudio>
+ <UserProperties
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-rt="..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE 2\jre5\lib\rt.jar"
REFS-JarPath-system-xml="..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE 2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-system="..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-j2se-helpers="..\lib\J2SE.Helpers.jar"/>
+ </VisualStudio>
+ </ProjectExtensions>
+</Project>
\ No newline at end of file
Modified: trunk/mcs/class/System.Configuration/Test/standalone/ChangeLog
===================================================================
--- trunk/mcs/class/System.Configuration/Test/standalone/ChangeLog
2006-11-05 11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/Test/standalone/ChangeLog
2006-11-05 12:42:51 UTC (rev 67370)
@@ -1,3 +1,8 @@
+2006-11-05 Vladimir Krasnov <[EMAIL PROTECTED]>
+
+ * t37.cs, t37.exe.config, t37.exe.expected: added some tests
+ for <remove> element
+
2006-09-05 Vladimir Krasnov <[EMAIL PROTECTED]>
* t37.cs, t37.exe.config, t37.exe.expected: new test for
Modified: trunk/mcs/class/System.Configuration/Test/standalone/t37.cs
===================================================================
--- trunk/mcs/class/System.Configuration/Test/standalone/t37.cs 2006-11-05
11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/Test/standalone/t37.cs 2006-11-05
12:42:51 UTC (rev 67370)
@@ -17,9 +17,17 @@
ConnectionStringSettings cssc2 =
((ConnectionStringsSection)connStrings).ConnectionStrings["AccessFileName"];
Console.WriteLine ("connStrings[AccessFileName] = {0}",
(cssc2 == null ? "null" : cssc2.ConnectionString));
+
+ AppSettingsSection sect = (AppSettingsSection)
config.AppSettings;
+ Console.WriteLine ("sect.Settings[hithere] = {0}",
(sect.Settings ["hithere"] == null ? "null" : sect.Settings
["hithere"].Value.ToString ()));
+
+ RsaProtectedConfigurationProvider rsa =
(RsaProtectedConfigurationProvider)ProtectedConfiguration.Providers
[ProtectedConfiguration.DefaultProvider];
+ Console.WriteLine ("rsa = {0}", (rsa == null ? "null" :
rsa.ToString ()));
+
}
catch (Exception e) {
Console.WriteLine ("{0} raised", e.GetType());
+ Console.WriteLine (e.Message);
}
}
}
Modified: trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.config
===================================================================
--- trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.config
2006-11-05 11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.config
2006-11-05 12:42:51 UTC (rev 67370)
@@ -7,4 +7,21 @@
connectionString="~/Data/ASPNetDB.mdb" />
<remove name="AccessFileName" />
</connectionStrings>
+
+<appSettings>
+ <add key="hithere" value="Hello World!"/>
+ <remove key="hithere" />
+</appSettings>
+
+<configProtectedData defaultProvider="MyRsaProtectedConfigurationProvider">
+ <providers>
+ <clear />
+ <add name="MyRsaProtectedConfigurationProvider"
+ type="System.Configuration.RsaProtectedConfigurationProvider,
System.Configuration, Version=2.0.0.0, Culture=neutral,
PublicKeyToken=b03f5f7f11d50a3a"
+ keyContainerName="MyKeys"
+ useMachineContainer="true" useOAEP="true" />
+ <remove name="MyRsaProtectedConfigurationProvider" />
+ </providers>
+ </configProtectedData>
+
</configuration>
Modified: trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.expected
===================================================================
--- trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.expected
2006-11-05 11:53:45 UTC (rev 67369)
+++ trunk/mcs/class/System.Configuration/Test/standalone/t37.exe.expected
2006-11-05 12:42:51 UTC (rev 67370)
@@ -1,2 +1,4 @@
connStrings[LocalSqlServer] = data source=127.0.0.1; Integrated Security=SSPI
connStrings[AccessFileName] = null
+sect.Settings[hithere] = null
+rsa = null
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
