diff options
| author | Konstantin Triger <kostat@mono-cvs.ximian.com> | 2005-12-06 17:38:44 +0300 |
|---|---|---|
| committer | Konstantin Triger <kostat@mono-cvs.ximian.com> | 2005-12-06 17:38:44 +0300 |
| commit | f189af9cc7066168c7762ceb00efd2a5c2717a8c (patch) | |
| tree | b1f4949e5a5e3729c9fea34adda2d6fae06126a9 /mcs/class/System.DirectoryServices | |
| parent | 77ab5c1f17d2eeac5c2f741cf2c91199fa698a80 (diff) | |
fixing conditional compilation constants
svn path=/trunk/mcs/; revision=53981
Diffstat (limited to 'mcs/class/System.DirectoryServices')
| -rw-r--r-- | mcs/class/System.DirectoryServices/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj | 12 |
2 files changed, 10 insertions, 6 deletions
diff --git a/mcs/class/System.DirectoryServices/ChangeLog b/mcs/class/System.DirectoryServices/ChangeLog index 5398ad7bf86..49ec548818d 100644 --- a/mcs/class/System.DirectoryServices/ChangeLog +++ b/mcs/class/System.DirectoryServices/ChangeLog @@ -1,3 +1,7 @@ +2005-12-06 Konstantin Triger <kostat@mainsoft.com> + + * System.DirectoryServices.vmwcsproj: fixing conditional compilation constants. + 2005-11-15 Vlad Spivak <spivak@mainsoft.com> * Added TARGET_JVM related source includes and excludes diff --git a/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj b/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj index 52a6b4a8e27..c6f155a30bf 100644 --- a/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj +++ b/mcs/class/System.DirectoryServices/System.DirectoryServices.vmwcsproj @@ -2,8 +2,8 @@ <CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{2A86AAED-1EF5-4BDC-8B53-9DBF6DAFD736}" >
<Build>
<Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="System.DirectoryServices" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="System.DirectoryServices" RunPostBuildEvent="OnBuildSuccess" StartupObject="">
- <Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
- <Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="J2EE" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+ <Config Name="Debug_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM;NET_1_1" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="false" OutputPath="bin\Debug_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
+ <Config Name="Release_Java" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="TARGET_JVM;NET_1_1" DocumentationFile="" DebugSymbols="false" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="1595" Optimize="true" OutputPath="bin\Release_Java\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="4"/>
<Config Name="Debug" AllowUnsafeBlocks="false" BaseAddress="285212672" CheckForOverflowUnderflow="false" ConfigurationOverrideFile="" DefineConstants="J2EE;TARGET_JVM" DocumentationFile="" DebugSymbols="true" FileAlignment="4096" IncrementalBuild="false" NoStdLib="false" NoWarn="" Optimize="false" OutputPath="bin\Debug\" RegisterForComInterop="false" RemoveIntegerChecks="false" TreatWarningsAsErrors="false" WarningLevel="1"/>
</Settings>
<References>
@@ -23,11 +23,11 @@ <File RelPath="System.DirectoryServices\DirectoryEntries.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.DirectoryServices\DirectoryEntry.cs" SubType="Component" BuildAction="Compile"/>
<File RelPath="System.DirectoryServices\DirectorySearcher.cs" SubType="Component" BuildAction="Compile"/>
- <File RelPath="System.DirectoryServices\DirectoryServicesPermission.cs" SubType="Code" BuildAction="Compile"/>
+ <File RelPath="System.DirectoryServices\DirectoryServicesPermission.cs" SubType="Code" BuildAction="None"/>
<File RelPath="System.DirectoryServices\DirectoryServicesPermissionAccess.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" SubType="Code" BuildAction="Compile"/>
+ <File RelPath="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" SubType="Code" BuildAction="None"/>
+ <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" SubType="Code" BuildAction="None"/>
+ <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" SubType="Code" BuildAction="None"/>
<File RelPath="System.DirectoryServices\DSDescriptionAttribute.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.DirectoryServices\PropertyCollection.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.DirectoryServices\PropertyValueCollection.cs" SubType="Code" BuildAction="Compile"/>
|