Author: noaml
Date: 2007-06-28 14:53:00 -0400 (Thu, 28 Jun 2007)
New Revision: 80990
Modified:
trunk/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
trunk/mcs/class/System/System20.csproj
Log:
Fix compilation in java
Modified:
trunk/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
===================================================================
---
trunk/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
2007-06-28 18:52:34 UTC (rev 80989)
+++
trunk/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
2007-06-28 18:53:00 UTC (rev 80990)
@@ -29,7 +29,9 @@
#if NET_2_0 && CONFIGURATION_DEP
+#if !TARGET_JVM
extern alias PrebuiltSystem;
+#endif
using System;
using System.Collections;
@@ -41,7 +43,11 @@
using System.Text;
using System.Xml;
+#if TARGET_JVM
+using NameValueCollection = System.Collections.Specialized.NameValueCollection;
+#else
using NameValueCollection =
PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
+#endif
namespace System.Configuration
{
Modified: trunk/mcs/class/System/System20.csproj
===================================================================
--- trunk/mcs/class/System/System20.csproj 2007-06-28 18:52:34 UTC (rev
80989)
+++ trunk/mcs/class/System/System20.csproj 2007-06-28 18:53:00 UTC (rev
80990)
@@ -8,7 +8,7 @@
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>System</AssemblyName>
- <JDKName>1.5.0_05</JDKName>
+ <JDKName>1.6</JDKName>
<GHProjectType>1</GHProjectType>
<GHProjectKind>framework</GHProjectKind>
<MergeExternal>..\lib\apache_http_client.jar</MergeExternal>
@@ -363,6 +363,8 @@
<Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />
<Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />
<Compile Include="System.ComponentModel.Design\IComponentChangeService.cs"
/>
+ <Compile
Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />
+ <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />
<Compile Include="System.ComponentModel.Design\IDesigner.cs" />
<Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />
<Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />
@@ -566,6 +568,7 @@
<Compile Include="System.Configuration\ConfigurationException.cs" />
<Compile Include="System.Configuration\ConfigurationSettings.cs" />
<Compile Include="System.Configuration\ConfigXmlDocument.cs" />
+ <Compile
Include="System.Configuration\CustomizableFileSettingsProvider.cs" />
<Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />
<Compile Include="System.Configuration\DictionarySectionHandler.cs" />
<Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />
@@ -1046,4 +1049,4 @@
</PostBuildEvent>
<PreBuildEvent>copy $(ProjectDir)\..\..\build\common\Consts.cs.in
$(ProjectDir)\..\..\build\common\Consts.cs</PreBuildEvent>
</PropertyGroup>
-</Project>
\ No newline at end of file
+</Project>
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches
