merge -r 53980:53981

svn path=/branches/mainsoft/gh1.7/mcs/; revision=53983

diff --git a/mcs/class/Novell.Directory.Ldap/ChangeLog b/mcs/class/Novell.Directory.Ldap/ChangeLog
index 929ae510c3b62ebec8c2da5a0003936ac5c67c24..bb307a7d186ca3fd91b3235c05c3cca878347b8f 100644 (file)
--- a/mcs/class/Novell.Directory.Ldap/ChangeLog
+++ b/mcs/class/Novell.Directory.Ldap/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-06 Konstantin Triger <kostat@mainsoft.com>
+
+        * Novell.Directory.Ldap.vmwcsproj: fixing conditional compilation constants.
+
 2005-16-11  Eyal Alaluf <eyala@mainsoft.com>
        * Makefile: Ignore ClsCompliant warnings for java profile
        

diff --git a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.vmwcsproj b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.vmwcsproj
index 49c7c8c1b0fa3a735f2f91ebece90e03de8d3ab1..6a97c60fbf5fc6d4db4bd7aa02ca5171954ce91a 100644 (file)
--- a/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.vmwcsproj
+++ b/mcs/class/Novell.Directory.Ldap/Novell.Directory.Ldap.vmwcsproj
@@ -2,8 +2,8 @@
        <CSHARP ProjectType="Local" ProductVersion="7.10.3077" SchemaVersion="2.0" ProjectGuid="{0B45F886-E6BB-4871-B9C1-77A0D92DA76E}">\r
                <Build>\r
                        <Settings ApplicationIcon="" AssemblyKeyContainerName="" AssemblyName="Novell.Directory.Ldap" AssemblyOriginatorKeyFile="" DefaultClientScript="JScript" DefaultHTMLPageLayout="Grid" DefaultTargetSchema="IE50" DelaySign="false" OutputType="Library" PreBuildEvent="" PostBuildEvent="" RootNamespace="Novell.Directory.Ldap" RunPostBuildEvent="OnBuildSuccess" StartupObject="">\r
-                               <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"/>\r
-                               <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"/>\r
+                               <Config Name="Debug_Java" AllowUnsafeBlocks="true" BaseAddress="285212672" CheckForOverflowUnderflow="true" 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="1"/>\r
+                               <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"/>\r
                                <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"/>\r
                        </Settings>\r
                        <References>\r

diff --git a/mcs/class/System.DirectoryServices/ChangeLog b/mcs/class/System.DirectoryServices/ChangeLog
index 5398ad7bf86e663116c5394381ed1ba6b6ce52a6..49ec548818da449b51c16048dc9833a3e06491b6 100644 (file)
--- 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 52a6b4a8e27f92b9b00a953365d483b23d11fd26..c6f155a30bf32c1981620987d6b4bf78ac304ad5 100644 (file)
--- 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}" >\r
                <Build>\r
                        <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="">\r
-                               <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"/>\r
-                               <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"/>\r
+                               <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"/>\r
+                               <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"/>\r
                                <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"/>\r
                        </Settings>\r
                        <References>\r
@@ -23,11 +23,11 @@
                                <File RelPath="System.DirectoryServices\DirectoryEntries.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="System.DirectoryServices\DirectoryEntry.cs" SubType="Component" BuildAction="Compile"/>\r
                                <File RelPath="System.DirectoryServices\DirectorySearcher.cs" SubType="Component" BuildAction="Compile"/>\r
-                               <File RelPath="System.DirectoryServices\DirectoryServicesPermission.cs" SubType="Code" BuildAction="Compile"/>\r
+                               <File RelPath="System.DirectoryServices\DirectoryServicesPermission.cs" SubType="Code" BuildAction="None"/>\r
                                <File RelPath="System.DirectoryServices\DirectoryServicesPermissionAccess.cs" SubType="Code" BuildAction="Compile"/>\r
-                               <File RelPath="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" SubType="Code" BuildAction="Compile"/>\r
-                               <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" SubType="Code" BuildAction="Compile"/>\r
-                               <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" SubType="Code" BuildAction="Compile"/>\r
+                               <File RelPath="System.DirectoryServices\DirectoryServicesPermissionAttribute.cs" SubType="Code" BuildAction="None"/>\r
+                               <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntry.cs" SubType="Code" BuildAction="None"/>\r
+                               <File RelPath="System.DirectoryServices\DirectoryServicesPermissionEntryCollection.cs" SubType="Code" BuildAction="None"/>\r
                                <File RelPath="System.DirectoryServices\DSDescriptionAttribute.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="System.DirectoryServices\PropertyCollection.cs" SubType="Code" BuildAction="Compile"/>\r
                                <File RelPath="System.DirectoryServices\PropertyValueCollection.cs" SubType="Code" BuildAction="Compile"/>\r