Author: kostat
Date: 2006-11-27 07:04:01 -0500 (Mon, 27 Nov 2006)
New Revision: 68501
Modified:
trunk/mcs/class/System/System20.sln
trunk/mcs/class/System/System20.vmwcsproj
Log:
TARGET_JVM: updtating project files with recent changes
Modified: trunk/mcs/class/System/System20.sln
===================================================================
--- trunk/mcs/class/System/System20.sln 2006-11-27 11:37:35 UTC (rev 68500)
+++ trunk/mcs/class/System/System20.sln 2006-11-27 12:04:01 UTC (rev 68501)
@@ -6,23 +6,17 @@
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug_Java|Any CPU = Debug_Java|Any CPU
- Debug_Java20_bootstrap|Any CPU = Debug_Java20_bootstrap|Any CPU
Debug_Java20|Any CPU = Debug_Java20|Any CPU
Release_Java|Any CPU = Release_Java|Any CPU
- Release_Java20_bootstrap|Any CPU = Release_Java20_bootstrap|Any
CPU
Release_Java20|Any CPU = Release_Java20|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java|Any
CPU.ActiveCfg = Debug_Java|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java|Any
CPU.Build.0 = Debug_Java|Any CPU
-
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java20_bootstrap|Any CPU.ActiveCfg
= Debug_Java20_bootstrap|Any CPU
-
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java20_bootstrap|Any CPU.Build.0 =
Debug_Java20_bootstrap|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java20|Any
CPU.ActiveCfg = Debug_Java20|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Debug_Java20|Any
CPU.Build.0 = Debug_Java20|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java|Any
CPU.ActiveCfg = Release_Java|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java|Any
CPU.Build.0 = Release_Java|Any CPU
-
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20_bootstrap|Any
CPU.ActiveCfg = Release_Java20_bootstrap|Any CPU
-
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20_bootstrap|Any CPU.Build.0
= Release_Java20_bootstrap|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20|Any
CPU.ActiveCfg = Release_Java20|Any CPU
{25EA16E1-E3B8-4433-8533-23B0FB0F93BA}.Release_Java20|Any
CPU.Build.0 = Release_Java20|Any CPU
EndGlobalSection
Modified: trunk/mcs/class/System/System20.vmwcsproj
===================================================================
--- trunk/mcs/class/System/System20.vmwcsproj 2006-11-27 11:37:35 UTC (rev
68500)
+++ trunk/mcs/class/System/System20.vmwcsproj 2006-11-27 12:04:01 UTC (rev
68501)
@@ -1,4 +1,4 @@
-<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build"
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == ''
">Debug_Java</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -19,27 +19,6 @@
</StartupObject>
<RunPostBuildEvent>OnOutputUpdated</RunPostBuildEvent>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release_Java20_bootstrap|AnyCPU' ">
- <OutputPath>bin\Release_Java20_bootstrap\</OutputPath>
- <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <Optimize>true</Optimize>
- <DebugType>pdbonly</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>
- <jarserver>iap2</jarserver>
- <TargetPlatform>0</TargetPlatform>
- </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Release_Java20|AnyCPU' ">
<OutputPath>bin\Release_Java20\</OutputPath>
<DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0;XML_DEP;CONFIGURATION_DEP;CONFIGURATION_2_0</DefineConstants>
@@ -112,27 +91,6 @@
<GHProjectKind>framework</GHProjectKind>
<TargetPlatform>0</TargetPlatform>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' ==
'Debug_Java20_bootstrap|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <OutputPath>bin\Debug_Java20_bootstrap\</OutputPath>
- <DefineConstants>TRACE;TARGET_JVM;NET_1_1;NET_2_0;DEBUG</DefineConstants>
- <BaseAddress>285212672</BaseAddress>
- <DebugType>full</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>
- <jarserver>iap2</jarserver>
- <TargetPlatform>0</TargetPlatform>
- </PropertyGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.csharp.targets" />
<Import Project="$(VMW_HOME)\bin\Mainsoft.Common.targets" />
<!-- To modify your build process, add your task inside one of the targets
below and uncomment it.
@@ -144,7 +102,7 @@
-->
<ProjectExtensions>
<VisualStudio>
- <UserProperties REFS-JarPath-system="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\System.jar"
REFS-JarPath-apache_http_client="..\lib\apache_http_client.jar"
REFS-JarPath-system-configuration="..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Configuration.jar"
REFS-JarPath-rt="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE
V2\jre5\lib\rt.jar" REFS-JarPath-mscorlib="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar"
REFS-JarPath-j2se-helpers="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-system-xml="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar" />
+ <UserProperties REFS-JarPath-system-xml="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Xml.jar"
REFS-JarPath-j2se-helpers="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin
for J2EE V2\jgac\vmw4j2ee_110\J2SE.Helpers.jar"
REFS-JarPath-mscorlib="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for
J2EE V2\jgac\vmw4j2ee_110\mscorlib.jar" REFS-JarPath-rt="..\..\..\..\..\Program
Files\Mainsoft\Visual MainWin for J2EE V2\jre5\lib\rt.jar"
REFS-JarPath-system-configuration="..\..\..\..\..\Program Files\Mainsoft\Visual
MainWin for J2EE V2\jgac\vmw4j2ee_110\System.Configuration.jar"
REFS-JarPath-apache_http_client="..\lib\apache_http_client.jar" />
</VisualStudio>
</ProjectExtensions>
<ItemGroup>
@@ -160,7 +118,7 @@
<Reference Include="rt, Version=0.0.0.0, Culture=neutral">
<Private>False</Private>
</Reference>
- <Reference Include="System.configuration" />
+ <Reference Include="System.Configuration" />
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
@@ -386,6 +344,7 @@
<Compile
Include="System.ComponentModel\DesignerSerializationVisibilityAttribute.cs" />
<Compile Include="System.ComponentModel\DesignOnlyAttribute.cs" />
<Compile Include="System.ComponentModel\DesignTimeVisibleAttribute.cs" />
+ <Compile Include="System.ComponentModel\DisplayNameAttribute.cs" />
<Compile Include="System.ComponentModel\DoubleConverter.cs" />
<Compile Include="System.ComponentModel\DoWorkEventArgs.cs" />
<Compile Include="System.ComponentModel\DoWorkEventHandler.cs" />
@@ -425,6 +384,7 @@
<Compile Include="System.ComponentModel\IRevertibleChangeTracking.cs" />
<Compile Include="System.ComponentModel\ISite.cs" />
<Compile Include="System.ComponentModel\ISupportInitialize.cs" />
+ <Compile Include="System.ComponentModel\ISupportInitializeNotification.cs"
/>
<Compile Include="System.ComponentModel\ISynchronizeInvoke.cs" />
<Compile Include="System.ComponentModel\ITypeDescriptorContext.cs" />
<Compile Include="System.ComponentModel\ITypedList.cs" />
@@ -960,12 +920,11 @@
<Content Include="System.Text.RegularExpressions\notes.txt" />
</ItemGroup>
<ItemGroup>
- <EmbeddedResource Include="machine.config">
+ <EmbeddedResource Include="..\..\..\mono\data\net_2_0\machine.jvm.config">
<LogicalName>machine.config</LogicalName>
</EmbeddedResource>
</ItemGroup>
<PropertyGroup>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches