Fix compilation in java

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

diff --git a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
index 21b26f50ada2861ba2b61e0b4f9400c14d9133d7..f4e346eea07ca2d4d2fc7fcaf2f3f5e39f7adaff 100644 (file)
--- a/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
+++ b/mcs/class/System/System.Configuration/CustomizableFileSettingsProvider.cs
@@ -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.Security.Cryptography;
 using System.Text;
 using System.Xml;
 
+#if TARGET_JVM\r
+using NameValueCollection = System.Collections.Specialized.NameValueCollection;
+#else
 using NameValueCollection = PrebuiltSystem.System.Collections.Specialized.NameValueCollection;
+#endif
 
 namespace System.Configuration
 {

diff --git a/mcs/class/System/System20.csproj b/mcs/class/System/System20.csproj
index 8eaa09ef1fce4661316a08afa73a416ef1a5b895..bd1773ebdfbfc6c0389368d8713a10d65b064186 100644 (file)
--- a/mcs/class/System/System20.csproj
+++ b/mcs/class/System/System20.csproj
@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>\r
     <AppDesignerFolder>Properties</AppDesignerFolder>\r
     <AssemblyName>System</AssemblyName>\r
-    <JDKName>1.5.0_05</JDKName>\r
+    <JDKName>1.6</JDKName>\r
     <GHProjectType>1</GHProjectType>\r
     <GHProjectKind>framework</GHProjectKind>\r
     <MergeExternal>..\lib\apache_http_client.jar</MergeExternal>\r
@@ -363,6 +363,8 @@
     <Compile Include="System.ComponentModel.Design\HelpKeywordAttribute.cs" />\r
     <Compile Include="System.ComponentModel.Design\HelpKeywordType.cs" />\r
     <Compile Include="System.ComponentModel.Design\IComponentChangeService.cs" />\r
+    <Compile Include="System.ComponentModel.Design\IComponentDiscoveryService.cs" />\r
+    <Compile Include="System.ComponentModel.Design\IComponentInitializer.cs" />\r
     <Compile Include="System.ComponentModel.Design\IDesigner.cs" />\r
     <Compile Include="System.ComponentModel.Design\IDesignerEventService.cs" />\r
     <Compile Include="System.ComponentModel.Design\IDesignerFilter.cs" />\r
@@ -566,6 +568,7 @@
     <Compile Include="System.Configuration\ConfigurationException.cs" />\r
     <Compile Include="System.Configuration\ConfigurationSettings.cs" />\r
     <Compile Include="System.Configuration\ConfigXmlDocument.cs" />\r
+    <Compile Include="System.Configuration\CustomizableFileSettingsProvider.cs" />\r
     <Compile Include="System.Configuration\DefaultSettingValueAttribute.cs" />\r
     <Compile Include="System.Configuration\DictionarySectionHandler.cs" />\r
     <Compile Include="System.Configuration\IApplicationSettingsProvider.cs" />\r
@@ -1046,4 +1049,4 @@
     </PostBuildEvent>\r
     <PreBuildEvent>copy $(ProjectDir)\..\..\build\common\Consts.cs.in $(ProjectDir)\..\..\build\common\Consts.cs</PreBuildEvent>\r
   </PropertyGroup>\r
-</Project>
\ No newline at end of file
+</Project>\r