some changes to the project file

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

diff --git a/mcs/class/System.Core/System.Core-2008.JavaEE.csproj b/mcs/class/System.Core/System.Core-2008.JavaEE.csproj
index 2a41470e8e3f1705d0fdbd3d68efd47ba23f5d2c..ff5718c725053279f6e303ec9d4e85a4407e31ed 100644 (file)
--- a/mcs/class/System.Core/System.Core-2008.JavaEE.csproj
+++ b/mcs/class/System.Core/System.Core-2008.JavaEE.csproj
@@ -21,7 +21,7 @@
     <RootNamespace>System.Core</RootNamespace>\r
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
-    <jarserver>ip2</jarserver>\r
+    <jarserver>ipa</jarserver>\r
     <PublishUrl>http://localhost/System.Core-2008.JavaEE/</PublishUrl>\r
     <Install>true</Install>\r
     <InstallFrom>Web</InstallFrom>\r
@@ -46,7 +46,7 @@
     <DebugType>full</DebugType>\r
     <Optimize>false</Optimize>\r
     <OutputPath>bin\Debug_Java\</OutputPath>\r
-    <DefineConstants>TRACE;DEBUG;JAVA;NET_3_5</DefineConstants>\r
+    <DefineConstants>TRACE;DEBUG;JAVA;NET_3_5;TARGET_JVM</DefineConstants>\r
     <ErrorReport>prompt</ErrorReport>\r
     <WarningLevel>4</WarningLevel>\r
     <BaseAddress>285212672</BaseAddress>\r

diff --git a/mcs/class/System.Core/Test/System.Core.Tests-2008.JavaEE.csproj b/mcs/class/System.Core/Test/System.Core.Tests-2008.JavaEE.csproj
index b2b0569e890ce5480843fbf8fadd247eaa2791de..08b5d5b6bb8a359fc69082cad624a66c7f2858ca 100644 (file)
--- a/mcs/class/System.Core/Test/System.Core.Tests-2008.JavaEE.csproj
+++ b/mcs/class/System.Core/Test/System.Core.Tests-2008.JavaEE.csproj
@@ -21,7 +21,7 @@
     <RootNamespace>System.Core.Tests</RootNamespace>\r
     <UpgradeBackupLocation>\r
     </UpgradeBackupLocation>\r
-    <jarserver>ip2</jarserver>\r
+    <jarserver>ipa</jarserver>\r
     <PublishUrl>http://localhost/System.Core.Tests-2008.JavaEE/</PublishUrl>\r
     <Install>true</Install>\r
     <InstallFrom>Web</InstallFrom>\r
@@ -77,14 +77,15 @@
   -->\r
   <ProjectExtensions>\r
     <VisualStudio>\r
-      <UserProperties REFS-RefInfo-system-core-2008-javaee="j2il:" REFS-JarPath-system-core-2008-javaee="..\bin\Debug_Java\System.Core-2008.JavaEE.jar" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system="" REFS-RefInfo-nunit-framework="j2il:" REFS-JarPath-nunit-framework="..\..\..\..\..\..\Repositories\mainsoft_trunk\studio\GH\runtime\mcs\nunit20\framework\bin\Debug_Java20\nunit.framework.jar" REFS-JarPath-rt="" REFS-RefInfo-rt="repository:jre:sun:1.6.0" />\r
+      <UserProperties REFS-RefInfo-rt="repository:jre:sun:1.6.0" REFS-JarPath-rt="" REFS-JarPath-nunit-framework="..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.jar" REFS-RefInfo-nunit-framework="j2il:" REFS-JarPath-system="" REFS-RefInfo-system="repository:vmw:framework:2.0" REFS-JarPath-system-core-2008-javaee="..\bin\Debug_Java\System.Core-2008.JavaEE.jar" REFS-RefInfo-system-core-2008-javaee="j2il:" />\r
     </VisualStudio>\r
   </ProjectExtensions>\r
   <ItemGroup>\r
-    <Reference Include="nunit.framework, Version=2.2.0.0, Culture=neutral, processorArchitecture=MSIL">\r
-      <SpecificVersion>False</SpecificVersion>\r
-      <HintPath>..\..\..\..\..\..\Repositories\mainsoft_trunk\studio\GH\runtime\mcs\nunit20\framework\bin\Debug_Java20\nunit.framework.dll</HintPath>\r
-    </Reference>\r
+         <Reference Include="nunit.framework">\r
+                 <SpecificVersion>False</SpecificVersion>\r
+                 <HintPath>..\..\..\nunit20\framework\bin\Debug_Java20\nunit.framework.dll</HintPath>\r
+                 <Private>True</Private>\r
+         </Reference>\r
     <Reference Include="rt, Version=1.6.0.65535, Culture=neutral, processorArchitecture=MSIL" />\r
     <Reference Include="System, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />\r
     <Reference Include="System.Core-2008.JavaEE, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">\r
@@ -114,7 +115,6 @@
     <None Include="System.Linq\ChangeLog" />\r
   </ItemGroup>\r
   <ItemGroup>\r
-    <Compile Include="Properties\AssemblyInfo.cs" />\r
     <Compile Include="System.Linq.Expressions\ExpressionTest.cs" />\r
     <Compile Include="System.Linq.Expressions\ExpressionTest_Add.cs" />\r
     <Compile Include="System.Linq.Expressions\ExpressionTest_AddChecked.cs" />\r
@@ -171,4 +171,7 @@
     <Compile Include="System.Linq\EnumerableTest.cs" />\r
     <Compile Include="System.Linq\QueryableTest.cs" />\r
   </ItemGroup>\r
+  <ItemGroup>\r
+    <Folder Include="Properties\" />\r
+  </ItemGroup>\r
 </Project>
\ No newline at end of file