diff options
| author | Andrew Skiba <andrews@mono-cvs.ximian.com> | 2005-12-08 12:32:16 +0300 |
|---|---|---|
| committer | Andrew Skiba <andrews@mono-cvs.ximian.com> | 2005-12-08 12:32:16 +0300 |
| commit | 0eee0d589c71883741e4fcd8b8bae1a53933a6a9 (patch) | |
| tree | 77dbf889f5d35c60a5121ad8b9af86a7ad7b66a0 /mcs/class/System.XML | |
| parent | 379179256ed3479cc7e1e23eba0aecc9e50dab54 (diff) | |
update GH project, delete TARGET_JVM from IXmlNamespaceResolver
svn path=/trunk/mcs/; revision=54103
Diffstat (limited to 'mcs/class/System.XML')
| -rw-r--r-- | mcs/class/System.XML/ChangeLog | 4 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.XML.vmwcsproj | 8 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs | 3 |
4 files changed, 10 insertions, 10 deletions
diff --git a/mcs/class/System.XML/ChangeLog b/mcs/class/System.XML/ChangeLog index 8d18fe7bdb4..43ec552a31b 100644 --- a/mcs/class/System.XML/ChangeLog +++ b/mcs/class/System.XML/ChangeLog @@ -1,3 +1,7 @@ +2005-12-08 Andrew Skiba <andrews@mainsoft.com> + + * System.XML.vmwcsproj: update the project with recent changes + 2005-12-08 Atsushi Enomoto <atsushi@ximian.com> * System.Xml.dll.sources : added XmlSchemaCompilationSettings.cs diff --git a/mcs/class/System.XML/System.XML.vmwcsproj b/mcs/class/System.XML/System.XML.vmwcsproj index 0599291b1d7..5c69d271b5a 100644 --- a/mcs/class/System.XML/System.XML.vmwcsproj +++ b/mcs/class/System.XML/System.XML.vmwcsproj @@ -10,7 +10,6 @@ <References>
<Reference Name="System" AssemblyName="System" HintPath="..\lib\System.dll"/>
<Reference Name="rt" AssemblyName="rt" HintPath="C:\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\j2sdk1.4.2_05\rt.dll" Private="False"/>
- <Reference Name="J2SE.Helpers" AssemblyName="J2SE.Helpers" HintPath="..\..\..\..\..\Program Files\Mainsoft\Visual MainWin for J2EE\jgac\vmw4j2ee_110\J2SE.Helpers.dll" Private="False"/>
</References>
</Build>
<Files>
@@ -49,9 +48,6 @@ <File RelPath="Mono.Xml.XPath\LocationPathPattern.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="Mono.Xml.XPath\Pattern.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="Mono.Xml.XPath\UnionPattern.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="Mono.Xml.XPath\XPathDocument2.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="Mono.Xml.XPath\XPathDocument2Editable.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="Mono.Xml.XPath\XPathDocument2Navigator.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="Mono.Xml.XPath\XPathEditableDocument.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="Mono.Xml.XPath\XPathNavigatorReader.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="Mono.Xml.Xsl\Attribute.cs" SubType="Code" BuildAction="Compile"/>
@@ -104,7 +100,6 @@ <File RelPath="Mono.Xml.Xsl.Operations\XslVariable.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\ChangeLog" BuildAction="None"/>
<File RelPath="System.Xml\ConformanceLevel.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="System.Xml\Driver.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\DTDAutomata.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\DTDObjectModel.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\DTDReader.cs" SubType="Code" BuildAction="Compile"/>
@@ -117,7 +112,6 @@ <File RelPath="System.Xml\MonoFIXAttribute.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\NameTable.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\NewLineHandling.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="System.Xml\Profile.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\ReadState.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\ValidationType.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\WhitespaceHandling.cs" SubType="Code" BuildAction="Compile"/>
@@ -165,7 +159,6 @@ <File RelPath="System.Xml\XmlParserInput.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\XmlProcessingInstruction.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\XmlQualifiedName.cs" SubType="Code" BuildAction="Compile"/>
- <File RelPath="System.Xml\XmlQualifiedNameTable.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\XmlReader.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\XmlReaderBinarySupport.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml\XmlReaderSettings.cs" SubType="Code" BuildAction="Compile"/>
@@ -206,6 +199,7 @@ <File RelPath="System.Xml.Schema\XmlSchemaChoice.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml.Schema\XmlSchemaCollection.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml.Schema\XmlSchemaCollectionEnumerator.cs" SubType="Code" BuildAction="Compile"/>
+ <File RelPath="System.Xml.Schema\XmlSchemaCompilationSettings.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml.Schema\XmlSchemaComplexContent.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml.Schema\XmlSchemaComplexContentExtension.cs" SubType="Code" BuildAction="Compile"/>
<File RelPath="System.Xml.Schema\XmlSchemaComplexContentRestriction.cs" SubType="Code" BuildAction="Compile"/>
diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog index 50c7595afb2..2657a2cfa27 100644 --- a/mcs/class/System.XML/System.Xml/ChangeLog +++ b/mcs/class/System.XML/System.Xml/ChangeLog @@ -1,3 +1,8 @@ +2005-12-08 Andrew Skiba <andrews@mainsoft.com> + + * IXmlNamespaceResolver.cs: delete TARGET_JVM, + no need to mangle the name + 2005-12-08 Atsushi Enomoto <atsushi@ximian.com> * Driver.cs, Profiler.cs, XmlQualifiedNameTable.cs : diff --git a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs index 085074b582c..aae1733ec52 100644 --- a/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs +++ b/mcs/class/System.XML/System.Xml/IXmlNamespaceResolver.cs @@ -38,9 +38,6 @@ namespace System.Xml #if NET_2_0 public interface IXmlNamespaceResolver #else -#if TARGET_JVM - [vmw.common.ChangeInterfaceMethodNames] -#endif internal interface IXmlNamespaceResolver #endif { |