Added TARGET_JVM NET_2_0 tests projects and run scripts.

svn path=/trunk/mcs/; revision=64855

diff --git a/mcs/class/System.Configuration/ChangeLog b/mcs/class/System.Configuration/ChangeLog
index 7804f3c6fa20dd85b6089f5075eac900d67a2154..b0ca7975134b46cb736dc955cbcf93589c51e79a 100644 (file)
--- a/mcs/class/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09     Boris Kirzner <borisk@mainsoft.com>
+
+       * run-tests.bat,  run-tests.test.bat: added scripts for NET_2_0
+       TARGET_JVM tests.
+
 2006-01-02  Chris Toshok  <toshok@ximian.com>
 
        * System.Configuration.dll.sources: add the Protected

diff --git a/mcs/class/System.Configuration/System.Configuration20.vmwcsproj b/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
index 6c07854fd9f897333021f4c282bd0a26f143a2cf..d2afd3ab1ba53b44ed8f2549e4156a907acf5a66 100755 (executable)
--- a/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
+++ b/mcs/class/System.Configuration/System.Configuration20.vmwcsproj
@@ -1,247 +1,247 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
-       <PropertyGroup>\r
-               <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>\r
-               <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
-               <ProductVersion>8.0.50727</ProductVersion>\r
-               <SchemaVersion>2.0</SchemaVersion>\r
-               <ProjectGuid>{7262AA8D-840C-4123-B99E-180F64F13A76}</ProjectGuid>\r
-               <OutputType>Library</OutputType>\r
-               <AppDesignerFolder>Properties</AppDesignerFolder>\r
-               <RootNamespace>System.Configuration</RootNamespace>\r
-               <AssemblyName>System.Configuration</AssemblyName>\r
-               <JDKName>1.5.0_05</JDKName>\r
-               <GHProjectType>1</GHProjectType>\r
-               <Version>2.0</Version>\r
-       </PropertyGroup>\r
-       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java20|AnyCPU' ">\r
-               <OutputPath>bin\Release_Java20\</OutputPath>\r
-               <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
-               <BaseAddress>285212672</BaseAddress>\r
-               <Optimize>true</Optimize>\r
-               <NoStdLib>false</NoStdLib>\r
-               <DebugType>pdbonly</DebugType>\r
-               <PlatformTarget>AnyCPU</PlatformTarget>\r
-               <ErrorReport>prompt</ErrorReport>\r
-               <SkipValidation>false</SkipValidation>\r
-               <KeepIntermediate>false</KeepIntermediate>\r
-               <GHProjectType>1</GHProjectType>\r
-               <PreCompile>false</PreCompile>\r
-               <AdditionalClassPath>\r
-               </AdditionalClassPath>\r
-               <ApplicationServerType>\r
-               </ApplicationServerType>\r
-               <Version>2.0</Version>\r
-               <JDKName>1.5.0_05</JDKName>\r
-               <TargetPlatform>0</TargetPlatform>\r
-       </PropertyGroup>\r
-       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
-               <DebugSymbols>true</DebugSymbols>\r
-               <OutputPath>bin\Debug_Java20\</OutputPath>\r
-               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>\r
-               <BaseAddress>285212672</BaseAddress>\r
-               <DebugType>full</DebugType>\r
-               <PlatformTarget>AnyCPU</PlatformTarget>\r
-               <ErrorReport>prompt</ErrorReport>\r
-               <SkipValidation>True</SkipValidation>\r
-               <KeepIntermediate>False</KeepIntermediate>\r
-               <GHProjectType>1</GHProjectType>\r
-               <PreCompile>false</PreCompile>\r
-               <AdditionalClassPath>\r
-               </AdditionalClassPath>\r
-               <ApplicationServerType>\r
-               </ApplicationServerType>\r
-               <Version>2.0</Version>\r
-               <JDKName>1.5.0_05</JDKName>\r
-               <TargetPlatform>0</TargetPlatform>\r
-       </PropertyGroup>\r
-       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
-               <DebugSymbols>true</DebugSymbols>\r
-               <DebugType>full</DebugType>\r
-               <Optimize>false</Optimize>\r
-               <OutputPath>bin\Debug_Java\</OutputPath>\r
-               <DefineConstants>TRACE;DEBUG;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
-               <ErrorReport>prompt</ErrorReport>\r
-               <WarningLevel>4</WarningLevel>\r
-               <BaseAddress>285212672</BaseAddress>\r
-               <NoStdLib>false</NoStdLib>\r
-               <SkipValidation>True</SkipValidation>\r
-               <KeepIntermediate>False</KeepIntermediate>\r
-               <TargetPlatform>0</TargetPlatform>\r
-               <AdditionalClassPath>\r
-               </AdditionalClassPath>\r
-       </PropertyGroup>\r
-       <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
-               <DebugType>pdbonly</DebugType>\r
-               <Optimize>true</Optimize>\r
-               <OutputPath>bin\Release_Java\</OutputPath>\r
-               <DefineConstants>TRACE;TARGET_JVM;NET_1_1;ONLY_1_1</DefineConstants>\r
-               <ErrorReport>prompt</ErrorReport>\r
-               <WarningLevel>4</WarningLevel>\r
-               <BaseAddress>285212672</BaseAddress>\r
-               <NoStdLib>false</NoStdLib>\r
-               <SkipValidation>false</SkipValidation>\r
-               <KeepIntermediate>false</KeepIntermediate>\r
-               <TargetPlatform>0</TargetPlatform>\r
-               <AdditionalClassPath>\r
-               </AdditionalClassPath>\r
-       </PropertyGroup>\r
-       <ItemGroup>\r
-               <Reference Include="J2SE.Helpers, Version=0.0.0.0, Culture=neutral">\r
-                       <HintPath>..\lib\J2SE.Helpers.dll</HintPath>\r
-                       <Private>False</Private>\r
-               </Reference>\r
-               <Reference Include="rt, Version=0.0.0.0, Culture=neutral">\r
-                       <HintPath>..\lib\rt.dll</HintPath>\r
-                       <Private>False</Private>\r
-               </Reference>\r
-               <Reference Include="System"/>\r
-               <Reference Include="System.XML"/>\r
-       </ItemGroup>\r
-       <ItemGroup>\r
-               <Compile Include="..\..\build\common\Locale.cs">\r
-                       <Link>Locale.cs</Link>\r
-               </Compile>\r
-               <Compile Include="Assembly\AssemblyInfo.cs"/>\r
-       </ItemGroup>\r
-       <ItemGroup>\r
-               <Compile Include="..\..\build\common\Consts.cs.in">\r
-                       <Link>Consts.cs.in</Link>\r
-               </Compile>\r
-               <Compile Include="..\..\build\common\MonoTODOAttribute.cs">\r
-                       <Link>MonoTODOAttribute.cs</Link>\r
-               </Compile>\r
-               <Compile Include="System.Configuration.Internal\DelegatingConfigHost.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IConfigErrorInfo.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IConfigSystem.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IConfigurationManagerHelper.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IConfigurationManagerInternal.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigClientHost.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigConfigurationFactory.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigHost.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigRecord.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigRoot.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigSettingsFactory.cs"/>\r
-               <Compile Include="System.Configuration.Internal\IInternalConfigSystem.cs"/>\r
-               <Compile Include="System.Configuration.Internal\InternalConfigEventArgs.cs"/>\r
-               <Compile Include="System.Configuration.Internal\InternalConfigEventHandler.cs"/>\r
-               <Compile Include="System.Configuration.Internal\StreamChangeCallback.cs"/>\r
-               <Compile Include="System.Configuration.Provider\ProviderBase.cs"/>\r
-               <Compile Include="System.Configuration.Provider\ProviderCollection.cs"/>\r
-               <Compile Include="System.Configuration.Provider\ProviderException.cs"/>\r
-               <Compile Include="System.Configuration\AppSettingsSection.cs"/>\r
-               <Compile Include="System.Configuration\CallbackValidator.cs"/>\r
-               <Compile Include="System.Configuration\CallbackValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\ClientConfigurationSystem.cs"/>\r
-               <Compile Include="System.Configuration\CommaDelimitedStringCollection.cs"/>\r
-               <Compile Include="System.Configuration\CommaDelimitedStringCollectionConverter.cs"/>\r
-               <Compile Include="System.Configuration\ConfigHelper.cs"/>\r
-               <Compile Include="System.Configuration\ConfigInfo.cs"/>\r
-               <Compile Include="System.Configuration\Configuration.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationAllowDefinition.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationAllowExeDefinition.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationCollectionAttribute.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationConverterBase.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationElement.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationElementCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationElementCollectionType.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationElementProperty.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationErrorsException.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationFileMap.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationLocation.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationLocationCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationLockCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationManager.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationPermission.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationPermissionAttribute.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationProperty.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationPropertyAttribute.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationPropertyCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationPropertyOptions.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationSaveMode.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationSection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationSectionCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationSectionGroup.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationSectionGroupCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationUserLevel.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\ConfigurationValidatorBase.cs"/>\r
-               <Compile Include="System.Configuration\ConnectionStringSettings.cs"/>\r
-               <Compile Include="System.Configuration\ConnectionStringSettingsCollection.cs"/>\r
-               <Compile Include="System.Configuration\ConnectionStringsSection.cs"/>\r
-               <Compile Include="System.Configuration\ContextInformation.cs"/>\r
-               <Compile Include="System.Configuration\DefaultSection.cs"/>\r
-               <Compile Include="System.Configuration\DefaultValidator.cs"/>\r
-               <Compile Include="System.Configuration\DpapiProtectedConfigurationProvider.cs"/>\r
-               <Compile Include="System.Configuration\ElementInformation.cs"/>\r
-               <Compile Include="System.Configuration\ExeConfigurationFileMap.cs"/>\r
-               <Compile Include="System.Configuration\ExeContext.cs"/>\r
-               <Compile Include="System.Configuration\GenericEnumConverter.cs"/>\r
-               <Compile Include="System.Configuration\IConfigXmlNode.cs"/>\r
-               <Compile Include="System.Configuration\IgnoreSection.cs"/>\r
-               <Compile Include="System.Configuration\InfiniteIntConverter.cs"/>\r
-               <Compile Include="System.Configuration\InfiniteTimeSpanConverter.cs"/>\r
-               <Compile Include="System.Configuration\IntegerValidator.cs"/>\r
-               <Compile Include="System.Configuration\IntegerValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\InternalConfigurationFactory.cs"/>\r
-               <Compile Include="System.Configuration\InternalConfigurationHost.cs"/>\r
-               <Compile Include="System.Configuration\InternalConfigurationRoot.cs"/>\r
-               <Compile Include="System.Configuration\KeyValueConfigurationCollection.cs"/>\r
-               <Compile Include="System.Configuration\KeyValueConfigurationElement.cs"/>\r
-               <Compile Include="System.Configuration\KeyValueInternalCollection.cs"/>\r
-               <Compile Include="System.Configuration\LongValidator.cs"/>\r
-               <Compile Include="System.Configuration\LongValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\NameValueConfigurationCollection.cs"/>\r
-               <Compile Include="System.Configuration\NameValueConfigurationElement.cs"/>\r
-               <Compile Include="System.Configuration\NonEmptyStringFlags.cs"/>\r
-               <Compile Include="System.Configuration\PathLevel.cs"/>\r
-               <Compile Include="System.Configuration\PositiveTimeSpanValidator.cs"/>\r
-               <Compile Include="System.Configuration\PositiveTimeSpanValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\PropertyInformation.cs"/>\r
-               <Compile Include="System.Configuration\PropertyInformationCollection.cs"/>\r
-               <Compile Include="System.Configuration\PropertyValueOrigin.cs"/>\r
-               <Compile Include="System.Configuration\ProtectedConfiguration.cs"/>\r
-               <Compile Include="System.Configuration\ProtectedConfigurationProvider.cs"/>\r
-               <Compile Include="System.Configuration\ProtectedConfigurationProviderCollection.cs"/>\r
-               <Compile Include="System.Configuration\ProtectedConfigurationSection.cs"/>\r
-               <Compile Include="System.Configuration\ProtectedProviderSettings.cs"/>\r
-               <Compile Include="System.Configuration\ProviderSettings.cs"/>\r
-               <Compile Include="System.Configuration\ProviderSettingsCollection.cs"/>\r
-               <Compile Include="System.Configuration\RegexStringValidator.cs"/>\r
-               <Compile Include="System.Configuration\RegexStringValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\SectionGroupInfo.cs"/>\r
-               <Compile Include="System.Configuration\SectionInfo.cs"/>\r
-               <Compile Include="System.Configuration\SectionInformation.cs"/>\r
-               <Compile Include="System.Configuration\StringValidator.cs"/>\r
-               <Compile Include="System.Configuration\StringValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\SubclassTypeValidator.cs"/>\r
-               <Compile Include="System.Configuration\SubclassTypeValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanMinutesConverter.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanMinutesOrInfiniteConverter.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanPropertyFlags.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanSecondsConverter.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanSecondsOrInfiniteConverter.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanSerializedFormat.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanValidator.cs"/>\r
-               <Compile Include="System.Configuration\TimeSpanValidatorAttribute.cs"/>\r
-               <Compile Include="System.Configuration\TypeNameConverter.cs"/>\r
-               <Compile Include="System.Configuration\ValidatorCallback.cs"/>\r
-               <Compile Include="System.Configuration\WhiteSpaceTrimStringConverter.cs"/>\r
-       </ItemGroup>\r
-       <ItemGroup>\r
-               <Folder Include="Properties\"/>\r
-       </ItemGroup>\r
-       <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets"/>\r
-       <Import Project="$(GHROOT)\bin\Mainsoft.Common.targets"/>\r
-       <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
-       Other similar extension points exist, see Microsoft.Common.targets.\r
-  <Target Name="BeforeBuild">\r
-  </Target>\r
-  <Target Name="AfterBuild">\r
-  </Target>\r
-  -->\r
-       <ProjectExtensions>\r
-               <VisualStudio>\r
-                       <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"/>\r
-               </VisualStudio>\r
-       </ProjectExtensions>\r
-</Project>\r
+<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. 
+       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>

diff --git a/mcs/class/System.Configuration/Test/ChangeLog b/mcs/class/System.Configuration/Test/ChangeLog
index 46c09115d8fb995f5c9ac26e19b473846cabb763..12ae82af7b5f0be31010e9838914f71cd2ea2486 100644 (file)
--- a/mcs/class/System.Configuration/Test/ChangeLog
+++ b/mcs/class/System.Configuration/Test/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-09     Boris Kirzner <borisk@mainsoft.com>
+
+       * System.Configuration.Test20.sln,
+       System.Configuration.Test20.vmwcsproj: added solution 
+       and project files for NET_2_0 TERGET_JVM tests.
+
 2005-12-16  Chris Toshok  <toshok@ximian.com>
 
        * System.Configuration/ConfigurationLockCollectionTest.cs

diff --git a/mcs/class/System.Configuration/Test/System.Configuration.Test20.sln b/mcs/class/System.Configuration/Test/System.Configuration.Test20.sln
new file mode 100644 (file)
index 0000000..35d2cb0
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/System.Configuration.Test20.sln
@@ -0,0 +1,23 @@
+\r
+Microsoft Visual Studio Solution File, Format Version 9.00\r
+# Visual Studio 2005\r
+Project("{83B010C7-76FC-4FAD-A26C-00D7EFE60256}") = "System.Configuration.Test20", "System.Configuration.Test20.vmwcsproj", "{A9AEBFBA-4D4C-495A-8851-C70E5132DC10}"\r
+EndProject\r
+Global\r
+       GlobalSection(SolutionConfigurationPlatforms) = preSolution\r
+               Debug_Java|Any CPU = Debug_Java|Any CPU\r
+               Debug_Java20|Any CPU = Debug_Java20|Any CPU\r
+               Release_Java|Any CPU = Release_Java|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(ProjectConfigurationPlatforms) = postSolution\r
+               {A9AEBFBA-4D4C-495A-8851-C70E5132DC10}.Debug_Java|Any CPU.ActiveCfg = Debug_Java|Any CPU\r
+               {A9AEBFBA-4D4C-495A-8851-C70E5132DC10}.Debug_Java|Any CPU.Build.0 = Debug_Java|Any CPU\r
+               {A9AEBFBA-4D4C-495A-8851-C70E5132DC10}.Debug_Java20|Any CPU.ActiveCfg = Debug_Java20|Any CPU\r
+               {A9AEBFBA-4D4C-495A-8851-C70E5132DC10}.Debug_Java20|Any CPU.Build.0 = Debug_Java20|Any CPU\r
+               {A9AEBFBA-4D4C-495A-8851-C70E5132DC10}.Release_Java|Any CPU.ActiveCfg = Release_Java|Any CPU\r
+               {A9AEBFBA-4D4C-495A-8851-C70E5132DC10}.Release_Java|Any CPU.Build.0 = Release_Java|Any CPU\r
+       EndGlobalSection\r
+       GlobalSection(SolutionProperties) = preSolution\r
+               HideSolutionNode = FALSE\r
+       EndGlobalSection\r
+EndGlobal\r

diff --git a/mcs/class/System.Configuration/Test/System.Configuration.Test20.vmwcsproj b/mcs/class/System.Configuration/Test/System.Configuration.Test20.vmwcsproj
new file mode 100644 (file)
index 0000000..b1a88dd
--- /dev/null
+++ b/mcs/class/System.Configuration/Test/System.Configuration.Test20.vmwcsproj
@@ -0,0 +1,133 @@
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java20|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <OutputPath>bin\Debug_Java20\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;JAVA;NET_2_0;TARGET_JVM</DefineConstants>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <DebugType>full</DebugType>\r
+    <PlatformTarget>AnyCPU</PlatformTarget>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <SkipValidation>True</SkipValidation>\r
+    <KeepIntermediate>False</KeepIntermediate>\r
+    <GHProjectType>1</GHProjectType>\r
+    <PreCompile>false</PreCompile>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+    <ApplicationServerType>\r
+    </ApplicationServerType>\r
+    <Version>2.0</Version>\r
+    <JDKName>1.5.0_05</JDKName>\r
+    <TargetPlatform>0</TargetPlatform>\r
+  </PropertyGroup>\r
+  <PropertyGroup>\r
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_Java</Configuration>\r
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>\r
+    <ProductVersion>8.0.50727</ProductVersion>\r
+    <SchemaVersion>2.0</SchemaVersion>\r
+    <ProjectGuid>{A9AEBFBA-4D4C-495A-8851-C70E5132DC10}</ProjectGuid>\r
+    <OutputType>Library</OutputType>\r
+    <AppDesignerFolder>Properties</AppDesignerFolder>\r
+    <RootNamespace>System.Configuration.Test</RootNamespace>\r
+    <AssemblyName>System.Configuration.Test20</AssemblyName>\r
+    <JDKName>1.5.0_05</JDKName>\r
+    <GHProjectType>1</GHProjectType>\r
+    <Version>2.0</Version>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_Java|AnyCPU' ">\r
+    <DebugSymbols>true</DebugSymbols>\r
+    <DebugType>full</DebugType>\r
+    <Optimize>false</Optimize>\r
+    <OutputPath>bin\Debug_Java\</OutputPath>\r
+    <DefineConstants>TRACE;DEBUG;JAVA;TARGET_JVM</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <SkipValidation>false</SkipValidation>\r
+    <KeepIntermediate>false</KeepIntermediate>\r
+    <TargetPlatform>0</TargetPlatform>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+  </PropertyGroup>\r
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_Java|AnyCPU' ">\r
+    <DebugType>pdbonly</DebugType>\r
+    <Optimize>true</Optimize>\r
+    <OutputPath>bin\Release_Java\</OutputPath>\r
+    <DefineConstants>TRACE;JAVA;NET_2_0;TARGET_JVM</DefineConstants>\r
+    <ErrorReport>prompt</ErrorReport>\r
+    <WarningLevel>4</WarningLevel>\r
+    <BaseAddress>285212672</BaseAddress>\r
+    <SkipValidation>false</SkipValidation>\r
+    <KeepIntermediate>false</KeepIntermediate>\r
+    <TargetPlatform>0</TargetPlatform>\r
+    <AdditionalClassPath>\r
+    </AdditionalClassPath>\r
+  </PropertyGroup>\r
+  <ItemGroup>\r
+    <Reference Include="nunit.core, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.dll</HintPath>\r
+      <Private>True</Private>\r
+    </Reference>\r
+    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
+      <SpecificVersion>False</SpecificVersion>\r
+      <HintPath>..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.dll</HintPath>\r
+      <Private>True</Private>\r
+    </Reference>\r
+    <Reference Include="rt, Version=0.0.0.0, Culture=neutral">\r
+      <Private>False</Private>\r
+    </Reference>\r
+    <Reference Include="System" />\r
+    <Reference Include="System.Configuration">\r
+      <Private>False</Private>\r
+    </Reference>\r
+    <Reference Include="System.Data" />\r
+    <Reference Include="System.Xml" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Compile Include="System.Configuration\CallbackValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\CommaDelimitedStringCollectionConverterTest.cs" />\r
+    <Compile Include="System.Configuration\CommaDelimitedStringCollectionTest.cs" />\r
+    <Compile Include="System.Configuration\ConfigurationElementTest.cs" />\r
+    <Compile Include="System.Configuration\ConfigurationLockCollectionTest.cs" />\r
+    <Compile Include="System.Configuration\ConfigurationManagerTest.cs" />\r
+    <Compile Include="System.Configuration\ConfigurationPermissionTest.cs" />\r
+    <Compile Include="System.Configuration\ConnectionStringSettingsTest.cs" />\r
+    <Compile Include="System.Configuration\DefaultValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\ExeConfigurationFileMapTest.cs" />\r
+    <Compile Include="System.Configuration\GenericEnumConverterTest.cs" />\r
+    <Compile Include="System.Configuration\InfiniteIntConverterTest.cs" />\r
+    <Compile Include="System.Configuration\InfiniteTimeSpanConverterTest.cs" />\r
+    <Compile Include="System.Configuration\IntegerValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\KeyValueConfigurationCollectionTest.cs" />\r
+    <Compile Include="System.Configuration\KeyValueConfigurationElementTest.cs" />\r
+    <Compile Include="System.Configuration\LongValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\PositiveTimeSpanValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\RegexStringValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\StringValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\SubclassTypeValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\TimeSpanMinutesConverterTest.cs" />\r
+    <Compile Include="System.Configuration\TimeSpanMinutesOrInfiniteConverterTest.cs" />\r
+    <Compile Include="System.Configuration\TimeSpanSecondsConverterTest.cs" />\r
+    <Compile Include="System.Configuration\TimeSpanSecondsOrInfiniteConverterTest.cs" />\r
+    <Compile Include="System.Configuration\TimeSpanValidatorTest.cs" />\r
+    <Compile Include="System.Configuration\TypeNameConverterTest.cs" />\r
+    <Compile Include="System.Configuration\WhiteSpaceTrimStringConverterTest.cs" />\r
+  </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Properties\" />\r
+  </ItemGroup>\r
+  <Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />\r
+  <Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />\r
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. \r
+       Other similar extension points exist, see Microsoft.Common.targets.\r
+  <Target Name="BeforeBuild">\r
+  </Target>\r
+  <Target Name="AfterBuild">\r
+  </Target>\r
+  -->\r
+  <ProjectExtensions>\r
+    <VisualStudio>\r
+      <UserProperties 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-data="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Data.jar" REFS-JarPath-system="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.jar" REFS-JarPath-mscorlib="..\..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-nunit-core="..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.core.jar" REFS-JarPath-nunit-framework="..\..\..\..\nunit20\core\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-system-configuration="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE 2\jgac\vmw4j2ee_110\System.Configuration.jar" />\r
+    </VisualStudio>\r
+  </ProjectExtensions>\r
+</Project>
\ No newline at end of file

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog b/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
index 10f6652b199d392f67a44a71a4db2c9f4d835881..cbb97b6e405edd8d773f67ff959d2d72c059b8e4 100644 (file)
--- a/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-09     Boris Kirzner <borisk@mainsoft.com>
+
+       * ConfigurationManagerTest.cs, ConfigurationPermissionTest.cs:
+       fixes for TARGET_JVM.
+
 2006-07-07  Atsushi Enomoto  <atsushi@ximian.com>
 
        * ConfigurationManagerTest.cs :

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
index efc76da4c6f9b35dc8540bdb07648f09f60b04b4..4cc1667b232c48ca9d0496831d9ff4d55c9f0c43 100644 (file)
--- a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationManagerTest.cs
@@ -50,7 +50,11 @@ namespace MonoTests.System.Configuration {
 
                        Console.WriteLine("application config path: {0}", config.FilePath);
                        FileInfo fi = new FileInfo (config.FilePath);
+#if TARGET_JVM
+                       Assert.AreEqual("System.Configuration.Test.jar.config", fi.Name);
+#else
                        Assert.AreEqual ("System.Configuration_test_net_2_0.dll.config", fi.Name);
+#endif
                }
 
                [Test]
@@ -239,7 +243,11 @@ namespace MonoTests.System.Configuration {
                        Console.WriteLine("null mapped application config path: {0}", config.FilePath); 
 
                        FileInfo fi = new FileInfo (config.FilePath);
+#if TARGET_JVM
+                       Assert.AreEqual("System.Configuration.Test.jar.config", fi.Name);
+#else
                        Assert.AreEqual ("System.Configuration_test_net_2_0.dll.config", fi.Name);
+#endif
                }
 
                [Test]
@@ -263,9 +271,11 @@ namespace MonoTests.System.Configuration {
                {
                        SysConfig cfg = ConfigurationManager.OpenMachineConfiguration ();
                        Assert.IsTrue (cfg.Sections.Count > 0, "#1");
+#if !TARGET_JVM
                        ConfigurationSection s = cfg.Sections ["system.net/connectionManagement"];
                        Assert.IsNotNull (s, "#2");
                        Assert.IsTrue (s is ConnectionManagementSection, "#3");
+#endif
                }
        }
 }

diff --git a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
index 307677001a19e9b8777704d98a4425a35993546b..5f994463a28d3f926d7641da584a5a43acee9e1f 100644 (file)
--- a/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
+++ b/mcs/class/System.Configuration/Test/System.Configuration/ConfigurationPermissionTest.cs
@@ -72,6 +72,7 @@ namespace MonoTests.System.Configuration {
                        Assert.IsNull (p3, "A1");
                }
 
+#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Intersect_wrongtype ()
@@ -80,6 +81,7 @@ namespace MonoTests.System.Configuration {
 
                        IPermission p3 = p1.Intersect (new StrongNameIdentityPermission (PermissionState.Unrestricted));
                }
+#endif
 
                [Test]
                public void Union ()
@@ -106,6 +108,7 @@ namespace MonoTests.System.Configuration {
                        Assert.IsTrue (((ConfigurationPermission)p3).IsUnrestricted(), "A2");
                }
 
+#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Union_wrongtypee ()
@@ -114,6 +117,7 @@ namespace MonoTests.System.Configuration {
 
                        IPermission p3 = p1.Union (new StrongNameIdentityPermission (PermissionState.Unrestricted));
                }
+#endif
 
                [Test]
                public void Subset ()
@@ -130,6 +134,7 @@ namespace MonoTests.System.Configuration {
                        Assert.IsTrue (p2.IsSubsetOf (null), "A6");
                }
 
+#if !TARGET_JVM
                [Test]
                [ExpectedException (typeof (ArgumentException))]
                public void Subset_wrongtype ()
@@ -138,8 +143,12 @@ namespace MonoTests.System.Configuration {
 
                        Assert.IsFalse (p1.IsSubsetOf (new StrongNameIdentityPermission (PermissionState.Unrestricted)));
                }
+#endif
 
                [Test]
+#if TARGET_JVM
+               [Category("NotWorking")]
+#endif
                public void ToXml ()
                {
                        ConfigurationPermission p = new ConfigurationPermission (PermissionState.Unrestricted);

diff --git a/mcs/class/System.Configuration/run-tests.bat b/mcs/class/System.Configuration/run-tests.bat
new file mode 100644 (file)
index 0000000..aca4038
--- /dev/null
+++ b/mcs/class/System.Configuration/run-tests.bat
@@ -0,0 +1,20 @@
+@echo off\r
+REM ********************************************************\r
+REM This batch call all the test batches with default parameters\r
+REM ********************************************************\r
+REM ********************************************************\r
+REM This batch file receives the follwing parameters:\r
+REM build/rebuild (optional): should the solution file be rebuilded \r
+REM                             or just builded before test run (default is rebuild)\r
+REM ********************************************************\r
+\r
+IF "%1"=="" (\r
+       set BUILD_OPTION=rebuild\r
+) ELSE (\r
+       set BUILD_OPTION=%1\r
+)\r
+\r
+set OUTPUT_FILE_PREFIX=MonoTests.System.DirectoryServices\r
+set RUNNING_FIXTURE=MonoTests.System.Configuration\r
+\r
+call run-tests.test.bat %BUILD_OPTION% %SECURE_MODE% %OUTPUT_FILE_PREFIX% %RUNNING_FIXTURE%\r

diff --git a/mcs/class/System.Configuration/run-tests.test.bat b/mcs/class/System.Configuration/run-tests.test.bat
new file mode 100644 (file)
index 0000000..847e923
--- /dev/null
+++ b/mcs/class/System.Configuration/run-tests.test.bat
@@ -0,0 +1,141 @@
+@echo on
+REM ********************************************************
+REM This batch file receives the follwing parameters:
+REM build/rebuild (optional): should the solution file be rebuilded 
+REM                             or just builded before test run (default is rebuild)
+REM output files name prefix (mandratory) : prefix for naming output xml files
+REM test fixture name (optional) : if you want to run some particular test fixture
+REM directory to run tests (optional)
+REM path back to root directory (opposite to previous param)
+REM example run-tests build GhTests Test.Sys.Drawing Test\DrawingTest\Test ..\..\..\
+REM will cause to build (and not rebuild) test solutions,
+REM running Test.Sys.Drawing fixture in directory Test\DrawingTest\Test
+REM with output files named GhTests.Net.xml and GhTests.GH.xml
+REM ********************************************************
+
+IF "%1"=="" GOTO USAGE
+
+IF "%JAVA_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+
+IF "%VMW_HOME%"=="" GOTO ENVIRONMENT_EXCEPTION
+
+
+IF "%1"=="" (
+       set BUILD_OPTION=rebuild
+) ELSE (
+       set BUILD_OPTION=%1
+)
+
+REM ********************************************************
+REM Set parameters
+REM ********************************************************
+
+set BUILD_OPTION=%1
+set OUTPUT_FILE_PREFIX=MonoTests.System.Configuration
+set RUNNING_FIXTURE=MonoTests.System.Configuration
+set TEST_SOLUTION=Test\System.Configuration.Test20.sln
+set TEST_ASSEMBLY=System.Configuration.Test20.jar
+set PROJECT_CONFIGURATION=Debug_Java20
+
+set OUTPUT_FILE_PREFIX=%OUTPUT_FILE_PREFIX%
+
+REM ********************************************************
+REM @echo Set environment
+REM ********************************************************
+
+set JGAC_PATH=%VMW_HOME%\jgac\vmw4j2ee_110\
+
+set RUNTIME_CLASSPATH=%JGAC_PATH%mscorlib.jar;%JGAC_PATH%System.jar;%JGAC_PATH%System.Xml.jar;%JGAC_PATH%System.Data.jar;%JGAC_PATH%J2SE.Helpers.jar
+set NUNIT_OPTIONS=/exclude=NotWorking
+
+set GH_OUTPUT_XML=%OUTPUT_FILE_PREFIX%.GH.xml
+
+set NUNIT_PATH=..\..\nunit20\
+set NUNIT_CLASSPATH=%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.framework.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.util.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit.core.jar;%NUNIT_PATH%nunit-console\bin\%PROJECT_CONFIGURATION%\nunit-console.jar
+
+set CLASSPATH="%RUNTIME_CLASSPATH%;%NUNIT_CLASSPATH%"
+
+REM ********************************************************
+@echo Building GH solution...
+REM ********************************************************
+
+rem devenv %TEST_SOLUTION% /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %TEST_SOLUTION% /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+REM ********************************************************
+@echo Building NUnit solution...
+REM ********************************************************
+
+if "%NUNIT_BUILD%" == "DONE" goto NUNITSKIP
+
+REM devenv ..\..\nunit20\nunit.java.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild ..\..\nunit20\nunit20.java.sln /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+
+goto NUNITREADY
+
+:NUNITSKIP
+echo Skipping NUnit Build...
+
+:NUNITREADY
+set NUNIT_BUILD=DONE
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+REM ********************************************************
+@echo Running GH tests...
+REM ********************************************************
+
+REM ********************************************************
+@echo Running fixture "%RUNNING_FIXTURE%"
+REM ********************************************************
+
+copy %BACK_TO_ROOT_DIR%Test\System.Configuration\bin\%PROJECT_CONFIGURATION%\%TEST_ASSEMBLY% .
+
+REM @echo on
+"%JAVA_HOME%\bin\java" -Xmx1024M -cp %CLASSPATH% NUnit.Console.ConsoleUi %TEST_ASSEMBLY% /fixture=%RUNNING_FIXTURE%  %NUNIT_OPTIONS% /xml=%GH_OUTPUT_XML% >>%RUNNING_FIXTURE%_run.log.txt 2<&1
+REM @echo off
+
+REM ********************************************************
+@echo Build XmlTool
+REM ********************************************************
+set XML_TOOL_PATH=..\..\tools\mono-xmltool
+REM devenv %XML_TOOL_PATH%\XmlTool.sln /%BUILD_OPTION% %PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+msbuild %XML_TOOL_PATH%\XmlTool20.vmwcsproj /t:%BUILD_OPTION% /p:Configuration=%PROJECT_CONFIGURATION% >>%RUNNING_FIXTURE%_build.log.txt 2<&1
+
+IF %ERRORLEVEL% NEQ 0 GOTO BUILD_EXCEPTION
+
+copy %XML_TOOL_PATH%\bin\%PROJECT_CONFIGURATION%\xmltool.exe .
+copy %XML_TOOL_PATH%\nunit_transform.xslt .
+
+REM ********************************************************
+@echo Analyze and print results
+REM ********************************************************
+@echo on
+xmltool.exe --transform nunit_transform.xslt %GH_OUTPUT_XML%
+@echo off
+
+:FINALLY
+GOTO END
+
+:ENVIRONMENT_EXCEPTION
+@echo This test requires environment variables JAVA_HOME and VMW_HOME to be defined
+GOTO END
+
+:BUILD_EXCEPTION
+@echo Error in building solutions. See %RUNNING_FIXTURE%_build.log.txt for details...
+REM EXIT 1
+GOTO END
+
+:RUN_EXCEPTION
+@echo Error in running fixture %RUNNING_FIXTURE%. See %RUNNING_FIXTURE%_run.log.txt for details...
+REM EXIT 1
+GOTO END
+
+:USAGE
+@echo Parameters: "[build|rebuild] <output_file_name_prefix> <test_fixture> <relative_Working_directory> <back_path (..\..\.....) >"
+GOTO END
+
+:END
+REM EXIT 0