You can subscribe to this list here.
2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(174) |
Nov
(85) |
Dec
(14) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2005 |
Jan
(56) |
Feb
|
Mar
|
Apr
|
May
(4) |
Jun
(1) |
Jul
(132) |
Aug
(5) |
Sep
|
Oct
(314) |
Nov
(133) |
Dec
(18) |
2006 |
Jan
(6) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: Oleg T. <he...@us...> - 2005-01-04 09:39:38
|
Update of /cvsroot/mvp-xml/Common/v1/src/Serialization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3863/v1/src/Serialization Added Files: CacheKeyFactory.cs PerfCounterInstaller.cs PerfCounterInstaller.resx PerfCounterManager.cs SignatureExtractor.cs StringSorter.cs XmlAttributeOverridesThumbprinter.cs XmlSerializerCache.cs Log Message: Added Serialization classes to the Common module. --- NEW FILE: XmlSerializerCache.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlAttributeOverridesThumbprinter.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: CacheKeyFactory.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: SignatureExtractor.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PerfCounterManager.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PerfCounterInstaller.resx --- <?xml version="1.0" encoding="utf-8" ?> <root> <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata"> <xsd:element name="root" msdata:IsDataSet="true"> <xsd:complexType> <xsd:choice maxOccurs="unbounded"> <xsd:element name="data"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" /> <xsd:attribute name="type" type="xsd:string" /> <xsd:attribute name="mimetype" type="xsd:string" /> </xsd:complexType> </xsd:element> <xsd:element name="resheader"> <xsd:complexType> <xsd:sequence> <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" /> </xsd:sequence> <xsd:attribute name="name" type="xsd:string" use="required" /> </xsd:complexType> </xsd:element> </xsd:choice> </xsd:complexType> </xsd:element> </xsd:schema> <resheader name="ResMimeType"> <value>text/microsoft-resx</value> </resheader> <resheader name="Version"> <value>1.0.0.0</value> </resheader> <resheader name="Reader"> <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <resheader name="Writer"> <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> </root> --- NEW FILE: PerfCounterInstaller.cs --- using System; using System.Collections; using System.ComponentModel; using System.Configuration.Install; using System.Diagnostics; namespace Mvp.Xml.Common.Serialization { /// <summary> /// Summary description for Installer1. /// </summary> [RunInstaller(true)] public class PerfCounterInstaller : System.Configuration.Install.Installer { /// <summary> /// Required designer variable. /// </summary> private System.ComponentModel.Container components = null; /// <summary> /// Instantiates the custom installer class /// </summary> public PerfCounterInstaller() { System.Diagnostics.Debug.WriteLine( "PerfCounterInstaller: done" ); // This call is required by the Designer. InitializeComponent(); try { // Create an instance of 'PerformanceCounterInstaller'. PerformanceCounterInstaller performanceCounterInstaller = new PerformanceCounterInstaller(); // Set the 'CategoryName' for performance counter. performanceCounterInstaller.CategoryName = PerfCounterManager.CATEGORY; CounterCreationData cacheHitCounterCreation = new CounterCreationData(); cacheHitCounterCreation.CounterName = PerfCounterManager.SERIALIZER_HITS_NAME; cacheHitCounterCreation.CounterHelp = PerfCounterManager.SERIALIZER_HITS_DESCRIPTION; cacheHitCounterCreation.CounterType = PerformanceCounterType.NumberOfItems64; CounterCreationData cachedInstancesCounterCreation = new CounterCreationData(); cachedInstancesCounterCreation.CounterName = PerfCounterManager.CACHED_INSTANCES_NAME; cachedInstancesCounterCreation.CounterHelp = PerfCounterManager.CACHED_INSTANCES_DESCRIPTION; cachedInstancesCounterCreation.CounterType = PerformanceCounterType.NumberOfItems64; // Add a counter to collection of performanceCounterInstaller. performanceCounterInstaller.Counters.Add(cacheHitCounterCreation); performanceCounterInstaller.Counters.Add(cachedInstancesCounterCreation); Installers.Add(performanceCounterInstaller); System.Diagnostics.Debug.WriteLine( "PerfCounterInstaller: Added counters and category" ); } catch(Exception e) { System.Diagnostics.Debug.WriteLine("PerfCounterInstaller Error occured :"+e.Message); } System.Diagnostics.Debug.WriteLine( "PerfCounterInstaller done" ); } /// <summary> /// Clean up any resources being used. /// </summary> protected override void Dispose( bool disposing ) { if( disposing ) { if(components != null) { components.Dispose(); } } base.Dispose( disposing ); } #region Component Designer generated code /// <summary> /// Required method for Designer support - do not modify /// the contents of this method with the code editor. /// </summary> private void InitializeComponent() { components = new System.ComponentModel.Container(); } #endregion } } --- NEW FILE: StringSorter.cs --- (This appears to be a binary file; contents omitted.) |
From: Oleg T. <he...@us...> - 2005-01-04 09:39:38
|
Update of /cvsroot/mvp-xml/Common/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3863/v1/test Modified Files: CommonTest.csproj Log Message: Added Serialization classes to the Common module. Index: CommonTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/CommonTest.csproj,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- CommonTest.csproj 22 Dec 2004 14:25:03 -0000 1.4 +++ CommonTest.csproj 4 Jan 2005 09:39:26 -0000 1.5 @@ -90,16 +90,21 @@ Project = "{12B8D3E3-4362-4E91-A3D2-37473083B47A}" Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" /> + <Reference + Name = "System.Management" + AssemblyName = "System.Management" + HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Management.dll" + /> + <Reference + Name = "System.Configuration.Install" + AssemblyName = "System.Configuration.Install" + HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll" + /> </References> </Build> <Files> <Include> <File - RelPath = "AssemblyInfo.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "BaseReader.cs" SubType = "Code" BuildAction = "Compile" @@ -279,6 +284,96 @@ BuildAction = "Compile" /> <File + RelPath = "XmlSerializerCacheTests\PerfCounterManagerTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\PerfCounterTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\StringSorterHelperTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\ThumbprintHelpers.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlAnyElementThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlArrayItemThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlArrayThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlAttributeOverridesThumbprinterTester.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlAttributeThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlChoiceIndetifierPrintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlDefaultValuePrintTest.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlElementThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlEnumAttributeThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlIgnoreThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlNamespaceThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlRootThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlSerializerCacheTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "XmlSerializerCacheTests\XmlTextThumbprintTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "XmlTransformingReaderTests\input.xml" BuildAction = "EmbeddedResource" /> |
Update of /cvsroot/mvp-xml/Common/v1/test/XmlSerializerCacheTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3863/v1/test/XmlSerializerCacheTests Added Files: PerfCounterManagerTests.cs PerfCounterTests.cs StringSorterHelperTests.cs ThumbprintHelpers.cs XmlAnyElementThumbprintTests.cs XmlArrayItemThumbprintTests.cs XmlArrayThumbprintTests.cs XmlAttributeOverridesThumbprinterTester.cs XmlAttributeThumbprintTests.cs XmlChoiceIndetifierPrintTests.cs XmlDefaultValuePrintTest.cs XmlElementThumbprintTests.cs XmlEnumAttributeThumbprintTests.cs XmlIgnoreThumbprintTests.cs XmlNamespaceThumbprintTests.cs XmlRootThumbprintTests.cs XmlSerializerCacheTests.cs XmlTextThumbprintTests.cs Log Message: Added Serialization classes to the Common module. --- NEW FILE: XmlRootThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PerfCounterTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlAnyElementThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlTextThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: ThumbprintHelpers.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlSerializerCacheTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlEnumAttributeThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlAttributeThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlAttributeOverridesThumbprinterTester.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlArrayItemThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: PerfCounterManagerTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlElementThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlNamespaceThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlChoiceIndetifierPrintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlArrayThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlDefaultValuePrintTest.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: XmlIgnoreThumbprintTests.cs --- (This appears to be a binary file; contents omitted.) --- NEW FILE: StringSorterHelperTests.cs --- (This appears to be a binary file; contents omitted.) |
From: Oleg T. <he...@us...> - 2005-01-04 09:39:35
|
Update of /cvsroot/mvp-xml/Common/v1/src/XPath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3863/v1/src/XPath Modified Files: XPathNavigatorReader.cs Log Message: Added Serialization classes to the Common module. Index: XPathNavigatorReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XPath/XPathNavigatorReader.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- XPathNavigatorReader.cs 1 Jan 2005 22:38:04 -0000 1.7 +++ XPathNavigatorReader.cs 4 Jan 2005 09:39:25 -0000 1.8 @@ -137,7 +137,7 @@ get { return _fragment || - //_navigator.NodeType == XPathNodeType.ProcessingInstruction || + _navigator.NodeType == XPathNodeType.ProcessingInstruction || _navigator.NodeType == XPathNodeType.Comment; } } |
From: Oleg T. <he...@us...> - 2005-01-04 09:37:56
|
Update of /cvsroot/mvp-xml/Common/v1/test/XmlSerializerCacheTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3582/XmlSerializerCacheTests Log Message: Directory /cvsroot/mvp-xml/Common/v1/test/XmlSerializerCacheTests added to the repository |
From: Oleg T. <he...@us...> - 2005-01-04 09:37:36
|
Update of /cvsroot/mvp-xml/Common/v1/src/Serialization In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3534/Serialization Log Message: Directory /cvsroot/mvp-xml/Common/v1/src/Serialization added to the repository |
From: Oleg T. <he...@us...> - 2005-01-03 18:38:06
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19630/v1/test Modified Files: Elliotte_Rusty_HaroldTests.cs EntryPoint.cs LTG_Edinburgh_UnivTests.cs NistTests.cs XIncludeTest.csproj Log Message: Updated Test Suite, generated tests and adjusted them. Index: XIncludeTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- XIncludeTest.csproj 18 Dec 2004 05:16:38 -0000 1.17 +++ XIncludeTest.csproj 3 Jan 2005 18:37:53 -0000 1.18 @@ -77,7 +77,7 @@ <Reference Name = "nunit.framework" AssemblyName = "nunit.framework" - HintPath = "..\..\..\..\..\Program Files\NUnit 2.2\bin\nunit.framework.dll" + HintPath = "C:\Program Files\NUnit 2.2\bin\nunit.framework.dll" AssemblyFolderKey = "hklm\dn\nunit.framework" /> <Reference @@ -90,35 +90,11 @@ AssemblyName = "System.Xml" HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> - <Reference - Name = "nunit.framework" - AssemblyName = "nunit.framework" - HintPath = "C:\Program Files\NUnit 2.2\bin\nunit.framework.dll" - AssemblyFolderKey = "hklm\dn\nunit.framework" - /> - <Reference - Name = "XInclude" - Project = "{3750FAB1-FD0E-425A-9DAA-87543A556319}" - Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" - /> </References> </Build> <Files> <Include> <File - RelPath = "book.xml" - BuildAction = "Content" - /> - <File - RelPath = "chap1.xml" - BuildAction = "Content" - /> - <File - RelPath = "SimpleTest.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Elliotte_Rusty_HaroldTests.cs" SubType = "Code" BuildAction = "Compile" @@ -323,15 +299,15 @@ BuildAction = "None" /> <File - RelPath = "XInclude-Test-Suite\testcases.dtd" + RelPath = "XInclude-Test-Suite\report.html" BuildAction = "Content" /> <File - RelPath = "XInclude-Test-Suite\testdescr.xml" + RelPath = "XInclude-Test-Suite\testcases.dtd" BuildAction = "Content" /> <File - RelPath = "XInclude-Test-Suite\w3cReport.html" + RelPath = "XInclude-Test-Suite\testdescr.xml" BuildAction = "Content" /> <File @@ -743,10 +719,6 @@ BuildAction = "Content" /> <File - RelPath = "XInclude-Test-Suite\Harold\test\.nautilus-metafile.xml" - BuildAction = "Content" - /> - <File RelPath = "XInclude-Test-Suite\Harold\test\acceptenglish.xml" BuildAction = "Content" /> @@ -1295,6 +1267,10 @@ BuildAction = "Content" /> <File + RelPath = "XInclude-Test-Suite\Harold\test\xpointerwithpercentescape.xml" + BuildAction = "Content" + /> + <File RelPath = "XInclude-Test-Suite\Harold\test\xptr2tumblertest.xml" BuildAction = "Content" /> Index: EntryPoint.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- EntryPoint.cs 22 Nov 2004 14:03:48 -0000 1.17 +++ EntryPoint.cs 3 Jan 2005 18:37:53 -0000 1.18 @@ -17,7 +17,7 @@ //XIncludeSyntaxTests rt = new XIncludeSyntaxTests(); try { - rt.Nist_include_49(); + rt.Nist_include_24(); } catch (Exception e) { Index: Elliotte_Rusty_HaroldTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/Elliotte_Rusty_HaroldTests.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- Elliotte_Rusty_HaroldTests.cs 7 Nov 2004 16:46:25 -0000 1.9 +++ Elliotte_Rusty_HaroldTests.cs 3 Jan 2005 18:37:52 -0000 1.10 @@ -187,7 +187,7 @@ /// <summary> /// Syntactically incorrect IRI is a fatal error (Eitehr I'm missing something or the spec needs to state this prinicple more clearly.) /// </summary> - /// <remarks>We treat it as resource error</remarks> + /// <remarks>WE TREAT IT AS RESOURCE ERROR</remarks> [Test] [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_13() @@ -200,7 +200,7 @@ /// <summary> /// Syntactically incorrect IRI with an unrecognized scheme is a fatal error /// </summary> - /// <remarks>We treat it as resource error</remarks> + /// <remarks>WE TREAT IT AS RESOURCE ERROR</remarks> [Test] [ExpectedException(typeof(DirectoryNotFoundException))] public void harold_14() @@ -985,7 +985,7 @@ XIncludeReaderTests.RunAndCompare( "http://localhost/test/EBCDIC.xml", "../../XInclude-Test-Suite/Harold/test/../result/EBCDIC.xml"); - RunAndCompare("EBCDIC.xml", "../result/EBCDIC.xml"); + RunAndCompare("EBCDIC.xml", "../result/EBCDIC.xml"); } @@ -1196,7 +1196,18 @@ RunAndCompare("badelementschemedata.xml", "../result/badelementschemedata.xml"); } + + /// <summary> + /// Since the xpointer attribute is not a URI reference, %-escaping must not appear in the XPointer, nor is there any need for a processor to apply or reverse such escaping. + /// </summary> + [Test] + [ExpectedException(typeof(FatalResourceException))] + public void harold_97() + { + RunAndCompare("xpointerwithpercentescape.xml", ""); + } + } } Index: LTG_Edinburgh_UnivTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/LTG_Edinburgh_UnivTests.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- LTG_Edinburgh_UnivTests.cs 1 Nov 2004 08:04:00 -0000 1.4 +++ LTG_Edinburgh_UnivTests.cs 3 Jan 2005 18:37:53 -0000 1.5 @@ -46,7 +46,6 @@ /// <summary> /// Verify that xi:include elements in the target have been processed in the acquired infoset, ie before the xpointer is applied. /// </summary> - /// <remarks>XIncludingReader doesn't support </remarks> [Test] public void eduni_2() { Index: NistTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NistTests.cs,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- NistTests.cs 22 Nov 2004 14:03:48 -0000 1.9 +++ NistTests.cs 3 Jan 2005 18:37:53 -0000 1.10 @@ -9,16 +9,16 @@ namespace Mvp.Xml.XInclude.Test { - /// <summary> - /// Edinburgh University test cases from the XInclude Test suite. - /// </summary> - [TestFixture] - public class NISTTests - { - public NISTTests() - { - Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); - } + /// <summary> + /// Edinburgh University test cases from the XInclude Test suite. + /// </summary> + [TestFixture] + public class NISTTests + { + public NISTTests() + { + Debug.Listeners.Add(new TextWriterTraceListener(Console.Error)); + } /// <summary> /// Utility method for running tests. @@ -707,11 +707,6 @@ public void Nist_include_56() { RunAndCompare("nist-include-56.xml", ""); - } - - - - - - } -} + } + } +} \ No newline at end of file |
From: Oleg T. <he...@us...> - 2005-01-03 18:38:04
|
Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Harold/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19630/v1/test/XInclude-Test-Suite/Harold/test Added Files: xpointerwithpercentescape.xml Log Message: Updated Test Suite, generated tests and adjusted them. --- NEW FILE: xpointerwithpercentescape.xml --- <?xml version="1.0"?> <root> <xi:include href="c1.xml" xpointer="element(/1/%32)" xmlns:xi="http://www.w3.org/2001/XInclude"/> </root> |
From: Oleg T. <he...@us...> - 2005-01-03 18:38:04
|
Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19630/v1/test/XInclude-Test-Suite Modified Files: testdescr.xml Added Files: report.html Log Message: Updated Test Suite, generated tests and adjusted them. --- NEW FILE: report.html --- <!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> <META http-equiv="Content-Type" content="text/html; charset=UTF-8"> <title>XInclude Conformance Tests</title> <meta content="text/html;charset=utf-8" http-equiv="Content-Type"> <style type="text/css"> BODY { font-family: Lucida, Helvetica, Univers, sans-serif; } H2, H3, H4 { text-align: left; color: #0066CC; } </style> <style type="text/css"> a:hover { color: white; background-color: blue; [...3526 lines suppressed...] </table> </td><td bgcolor="#ccffff"> <p>Since the xpointer attribute is not a URI reference, %-escaping must not appear in the XPointer, nor is there any need for a processor to apply or reverse such escaping.</p> </td> </tr> </table> <a name="contrib"></a> <h3>4. Contributors (Non-normative)</h3> <p> A team of volunteer members have participated in the development of this work. Contributions have come from: </p> <ul> <li>Sandra I. Martinez, NIST</li> <li>Daniel Veillard, Red Hat Network</li> <li>John Evdemon, FourThought</li> <li>Richard Tobin, University of Edinburgh</li> <li>Elliotte Rusty Harold</li> </ul> </body> </html> Index: testdescr.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/testdescr.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- testdescr.xml 19 Oct 2004 16:24:58 -0000 1.2 +++ testdescr.xml 3 Jan 2005 18:37:53 -0000 1.3 @@ -1580,7 +1580,14 @@ <description>Test that a non-child sequence in an xpointer is treated as a resource error.</description> <output>../result/badelementschemedata.xml</output> </testcase> - + + <testcase id="harold-97" href="xpointerwithpercentescape.xml" + type="error"> + <contributor>Elliotte Rusty Harold</contributor> + <section resource="http://www.w3.org/TR/xinclude/#include_element">3.1</section> + <date qualifier="created">13-Oct-2004</date> + <description>Since the xpointer attribute is not a URI reference, %-escaping must not appear in the XPointer, nor is there any need for a processor to apply or reverse such escaping.</description> + </testcase> </testcases> </testsuite> |
From: Oleg T. <he...@us...> - 2005-01-03 18:34:49
|
Update of /cvsroot/mvp-xml/WebSite/xinclude In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19040/xinclude Modified Files: index.html Log Message: Updated to final XInclude Recommendation. Index: index.html =================================================================== RCS file: /cvsroot/mvp-xml/WebSite/xinclude/index.html,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- index.html 9 Nov 2004 12:23:11 -0000 1.3 +++ index.html 3 Jan 2005 18:34:39 -0000 1.4 @@ -10,7 +10,7 @@ </h1> The XInclude.NET module provides an implementation of the <a href="http://www.w3.org/TR/xinclude/">W3C XML Inclusions (XInclude)1.0 -Proposed Recommendation</a> and the <a +Recommendation</a> and the <a href="http://www.w3.org/TR/xptr-framework/">XPointer Framework Recommendation</a> written in C# for the .NET platform. XInclude.NET supports <a href="http://www.w3.org/TR/xptr-element/">XPointer @@ -26,25 +26,26 @@ style="font-family: monospace;">XIncludingReader</span> class found in the <span style="font-family: monospace;">Mvp.Xml.XInclude</span> namespace. <br> -<p>XInclude.NET has been thoroughly tested against <!--StartFragment --><a - href="http://www.w3.org/XML/Test/XInclude/">The XInclude Test Suite</a> under +<p>XInclude.NET has been thoroughly tested against <a + href="http://www.w3.org/XML/Test/XInclude/">XML Inclusions (XInclude) +Version 1.0, W3C Conformance Test Suite (2004-11-03)</a> under Microsoft .NET 1.0 and 1.1 on Windows 2000 and Windows Server 2003.<br> </p> <p style="font-weight: bold;">Contents:</p> - <ol> - <li><a href="#mozTocId537061">Requirements</a></li> - <li><a href="#mozTocId172804">Download</a></li> - <li><a href="#mozTocId593736">Installation and +<ol> + <li><a href="#mozTocId537061">Requirements</a></li> + <li><a href="#mozTocId172804">Download</a></li> + <li><a href="#mozTocId593736">Installation and Documentation</a></li> - <li><a href="#mozTocId209347">History</a></li> - <li><a href="#mozTocId156645">Usage</a></li> - <li><a href="#mozTocId795134">Custom XmlResolver</a></li> - <li><a href="#mozTocId893216">XPointer</a></li> - <li><a href="#mozTocId299036">Conformance Issues </a></li> - <li><a href="#mozTocId670936">License</a></li> - <li><a href="#mozTocId666501">Bug reports</a></li> - <li><a href="#mozTocId594662">Feedback</a></li> - </ol> + <li><a href="#mozTocId209347">History</a></li> + <li><a href="#mozTocId156645">Usage</a></li> + <li><a href="#mozTocId795134">Custom XmlResolver</a></li> + <li><a href="#mozTocId893216">XPointer</a></li> + <li><a href="#mozTocId299036">Conformance Issues </a></li> + <li><a href="#mozTocId670936">License</a></li> + <li><a href="#mozTocId666501">Bug reports</a></li> + <li><a href="#mozTocId594662">Feedback</a></li> +</ol> <h2><a class="mozTocH2" name="mozTocId537061"></a>1. Requirements</h2> <p>XInclude.NET is .NET Framework application and requires <a href="http://msdn.microsoft.com/netframework/" target="_top"> .NET @@ -97,7 +98,8 @@ style="font-family: monospace;">Mvp.Xml.XInclude</span></a> instead of <span style="font-family: monospace;">GotDotNet.XInclude</span>.<br> </li> - <li>Upgraded to support the new XInclude Proposed Rec syntax and + <li>Upgraded to support the new XInclude final Recommendation syntax +and semantics.</li> <li>Added support for the xml:lang fixup.<br> </li> @@ -228,17 +230,17 @@ <ol> <li><span style="font-family: monospace;">XIncludingReader</span> class only implenments the <a - href="http://www.w3.org/TR/2004/PR-xinclude-20040930/#include-location">streamable + href="http://www.w3.org/TR/xinclude/#include-location">streamable subset</a> of XInclude - intra-document references are not supported. That means <span style="font-family: monospace;">XIncludingReader</span> treats absence of an "<span style="font-family: monospace;">href</span>" attribute on an <span style="font-family: monospace;">xi:include</span> element as <a - href="http://www.w3.org/TR/2004/PR-xinclude-20040930/#dt-resource-error">XInclude + href="http://www.w3.org/TR/xinclude/#dt-resource-error">XInclude resource error</a>.<br> </li> <li>Syntactically incorrect URI references are treated as <a - href="http://www.w3.org/TR/2004/PR-xinclude-20040930/#dt-resource-error">XInclude + href="http://www.w3.org/TR/xinclude/#dt-resource-error">XInclude resource error</a>.</li> <li>Only XPath subset of the <a |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-03 17:51:59
|
Update of /cvsroot/mvp-xml/Design/v1/src/CustomTools/ResX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9289/v1/src/CustomTools/ResX Added Files: ResX2Cs.cs ResX2CsConstants.cs ResXTool.cs Log Message: Initial version of XmlValidate custom tool and ResX two Class tool. --- NEW FILE: ResX2CsConstants.cs --- using System; using System.CodeDom; using System.Collections; using System.IO; using System.Reflection; using System.Text.RegularExpressions; using System.Xml; using System.Xml.XPath; using System.Xml.Serialization; using Microsoft.ApplicationBlocks.IPE.Transformations.ComponentModel; namespace Microsoft.ApplicationBlocks.IPE.Transformations.Tests.Assets.ResX { /// <summary> /// Generates a resource file. /// </summary> public class ResX2CsConstants : TaskBase { #region Constants public const string FileNameParameter = "FileName"; public const string TargetNamespaceParameter = "TargetNamespace"; private const string SkeletonSnippet = @" private static ResourceManager _resourceManager = new ResourceManager( typeof( SR ).FullName, typeof( SR ).Module.Assembly ); private SR() {} /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The object resource.</returns> internal static object GetObject( string key ) { return _resourceManager.GetObject( key ); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The string resource.</returns> internal static string GetString( string key ) { return _resourceManager.GetString( key ); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/> and /// formats it with the arguments received. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <param name='args'>The arguments to format the resource with.</param> /// <returns>The string resource.</returns> internal static string GetString ( string key, params object[] args ) { return String.Format( GetString( key ), args ); } "; private readonly Regex ValueWithParams = new Regex(@"(?<={)\d+(?=})", RegexOptions.Compiled); #endregion Constants #region ITask Members public override void Run() { IParameterService prms = ( IParameterService ) GetService( typeof( IParameterService ) ); string file = ( string )prms[FileNameParameter]; string target = ( string )prms[TargetNamespaceParameter]; CodeCompileUnit unit = new CodeCompileUnit(); CodeNamespace ns = new CodeNamespace( target ); unit.Namespaces.Add( ns ); ns.Imports.Add( new CodeNamespaceImport( "System" ) ); ns.Imports.Add( new CodeNamespaceImport( "System.Resources" ) ); ns.Imports.Add( new CodeNamespaceImport( "System.Threading" ) ); CodeCommentStatement remarks = new CodeCommentStatement( "<remaks/>", true ); using ( FileStream fs = new FileStream( file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite ) ) { XPathDocument doc = new XPathDocument( fs ); CodeTypeDeclaration sr = new CodeTypeDeclaration( "SR" ); sr.TypeAttributes = TypeAttributes.NestedAssembly | TypeAttributes.Sealed; sr.Comments.Add(new CodeCommentStatement( "<summary>Contains resources for the application.</summary>", true)); ns.Types.Add( sr ); // Add the default snippet. sr.Members.Add( new CodeSnippetTypeMember( SkeletonSnippet ) ); XPathNodeIterator it = doc.CreateNavigator().Select( "/root/data" ); while ( it.MoveNext() ) { // Work with a copy to avoid cursor movements. string key = it.Current.GetAttribute( "name", String.Empty ); if ( key != null ) { // Remove invalid characters from name chosen by the user. string name = CodeIdentifier.MakeValid( key ); // We can use a property as it's a simple object/string. CodeMemberField fld = new CodeMemberField(typeof(string), name); fld.Attributes = MemberAttributes.Const | MemberAttributes.Public; fld.InitExpression = new CodePrimitiveExpression(name); sr.Members.Add( fld ); } } } IOutputService output = ( IOutputService ) GetService( typeof ( IOutputService ) ); output.Add( OutputKey.CodeDom, unit ); } #endregion } } --- NEW FILE: ResX2Cs.cs --- using System; using System.CodeDom; using System.Collections; using System.IO; using System.Reflection; using System.Text.RegularExpressions; using System.Xml; using System.Xml.XPath; using System.Xml.Serialization; using Microsoft.ApplicationBlocks.IPE.Transformations.ComponentModel; namespace Microsoft.ApplicationBlocks.IPE.Transformations.Tests.Assets.ResX { /// <summary> /// Generates a typed class for a resource file /// <see cref="XmlWriter"/>. /// </summary> public class ResX2Cs : TaskBase { #region Constants public const string FileNameParameter = "FileName"; public const string TargetNamespaceParameter = "TargetNamespace"; private const string SkeletonSnippet = @" private static ResourceManager _resourceManager = new ResourceManager( typeof( SR ).FullName, typeof( SR ).Module.Assembly ); private SR() {} /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The object resource.</returns> internal static object GetObject( string key ) { return _resourceManager.GetObject( key ); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/>. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <returns>The string resource.</returns> internal static string GetString( string key ) { return _resourceManager.GetString( key ); } /// <summary> /// Gets the specified resource for the <see cref='Thread.CurrentUICulture'/> and /// formats it with the arguments received. /// </summary> /// <param name='key'>The key of the resource to retrieve.</param> /// <param name='args'>The arguments to format the resource with.</param> /// <returns>The string resource.</returns> internal static string GetString ( string key, params object[] args ) { return String.Format( GetString( key ), args ); } "; private readonly Regex ValueWithParams = new Regex(@"(?<={)\d+(?=})", RegexOptions.Compiled); #endregion Constants #region ITask Members public override void Run() { IParameterService prms = ( IParameterService ) GetService( typeof( IParameterService ) ); string file = ( string )prms[FileNameParameter]; string target = ( string )prms[TargetNamespaceParameter]; CodeCompileUnit unit = new CodeCompileUnit(); CodeNamespace ns = new CodeNamespace( target ); unit.Namespaces.Add( ns ); ns.Imports.Add( new CodeNamespaceImport( "System" ) ); ns.Imports.Add( new CodeNamespaceImport( "System.Resources" ) ); ns.Imports.Add( new CodeNamespaceImport( "System.Threading" ) ); CodeCommentStatement remarks = new CodeCommentStatement( "<remaks/>", true ); using ( FileStream fs = new FileStream( file, FileMode.Open, FileAccess.Read, FileShare.ReadWrite ) ) { XPathDocument doc = new XPathDocument( fs ); CodeTypeDeclaration sr = new CodeTypeDeclaration( "SR" ); sr.TypeAttributes = TypeAttributes.NestedAssembly | TypeAttributes.Sealed; sr.Comments.Add(new CodeCommentStatement( "<summary>Contains resources for the application.</summary>", true)); ns.Types.Add( sr ); // Add the default snippet. sr.Members.Add( new CodeSnippetTypeMember( SkeletonSnippet ) ); XPathNodeIterator it = doc.CreateNavigator().Select( "/root/data" ); while ( it.MoveNext() ) { // Work with a copy to avoid cursor movements. XPathNavigator item = it.Current.Clone(); string key = item.GetAttribute( "name", String.Empty ); if ( key != null ) { string type = item.GetAttribute( "type", String.Empty ); if ( type == null ) type = "System.String"; // Remove invalid characters from name chosen by the user. string name = CodeIdentifier.MakeValid( key ); // Get the value used to check for parameters. string value = String.Empty; item.MoveToFirstChild(); if (item.LocalName == "value") value = item.Value; // Build the call to GetString/GetObject CodeMethodInvokeExpression getres = new CodeMethodInvokeExpression(); // Build the return statement. CodeMethodReturnStatement ret = new CodeMethodReturnStatement(); // Will hold the member that is to be added to the SR class. CodeTypeMember member = null; // If type is not string, modify GetString with GetObject and cast to type. if (type != "System.String") { getres.Method = new CodeMethodReferenceExpression( new CodeTypeReferenceExpression( "SR" ), "GetObject"); ret.Expression = new CodeCastExpression(type, getres); } else { getres.Method = new CodeMethodReferenceExpression( new CodeTypeReferenceExpression( "SR" ), "GetString"); ret.Expression = getres; } if (ValueWithParams.IsMatch( value ) ) { // We have a value that receives parameters. Make a method instead of a property. CodeMemberMethod method = new CodeMemberMethod(); method.ReturnType = new CodeTypeReference(type); method.Name = name; Match p = ValueWithParams.Match( value ); while ( p.Success ) { method.Parameters.Add( new CodeParameterDeclarationExpression( typeof(object), "arg" + p.Value ) ); getres.Parameters.Add( new CodeFieldReferenceExpression( null, "arg" + p.Value) ); p = p.NextMatch(); } method.Statements.Add( ret ); // Set as the member to add. member = method; } else { // We can use a property as it's a simple object/string. CodeMemberProperty prop = new CodeMemberProperty(); prop.Type = new CodeTypeReference(type); prop.Name = name; prop.GetStatements.Add( ret ); // Set as the member to add. member = prop; } // Add the first parameter to the call which is always the key. getres.Parameters.Insert(0, new CodePrimitiveExpression( key ) ); string comment = ( string ) it.Current.Evaluate( "string( comment/text() )" ); if ( comment != null ) { member.Comments.Add( new CodeCommentStatement( "<summary>" + comment.Replace( "\r", "" ).Replace( "\n", "" ).Replace( "\t", "" ) + "</summary>", true ) ); } member.Attributes = MemberAttributes.Public | MemberAttributes.Final | MemberAttributes.Static; sr.Members.Add( member ); } } } IOutputService output = ( IOutputService ) GetService( typeof ( IOutputService ) ); output.Add( OutputKey.CodeDom, unit ); } #endregion } } --- NEW FILE: ResXTool.cs --- #region using using System; using System.CodeDom; using System.Collections; using System.ComponentModel; using System.ComponentModel.Design; using System.IO; using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Xml; using System.Xml.XPath; using EnvDTE; using VSLangProj; #endregion namespace Mvp.Xml.Design.CustomTools.XGen { /// <summary> /// Generates custom typed XmlSerializers. /// </summary> /// <remarks> /// On any class set the Custom Tool property to "SGen". /// This tool supports C# projects only, as that's the code generated /// by the XmlSerializer class. /// </remarks> [Guid("B8F154A6-E234-4c6f-9AD4-675713F4AABD")] [CustomTool("Mvp.Xml.ResX", "MVP XML Strongly Typed Resources Generator", true)] [ComVisible(true)] [VersionSupport("7.1")] [VersionSupport("7.0")] [CategorySupport(CategorySupportAttribute.CSharpCategory)] [CategorySupport(CategorySupportAttribute.VBCategory)] public class ResXTool : CustomTool { #region GenerateCode /// <summary> /// Generates the output. /// </summary> protected override byte[] GenerateCode(string inputFileName, string inputFileContent) { try { CodeCompileUnit unit = new CodeCompileUnit(); CodeNamespace ns = new CodeNamespace(base.FileNameSpace); unit.Namespaces.Add(ns); ns.Imports.Add(new CodeNamespaceImport("System")); ns.Imports.Add(new CodeNamespaceImport("System.Resources")); ns.Imports.Add(new CodeNamespaceImport("System.Threading")); // Cached remarks for empty comments. CodeCommentStatement remarks = new CodeCommentStatement("<remaks/>", true); XPathDocument doc = new XPathDocument(new StringReader(inputFileContent)); CodeTypeDeclaration sr = new CodeTypeDeclaration( "SR" ); sr.TypeAttributes = TypeAttributes.NestedAssembly | TypeAttributes.Sealed; sr.Comments.Add(new CodeCommentStatement( "<summary>Contains resources for the application.</summary>", true)); ns.Types.Add( sr ); // Add the default snippet. sr.Members.Add( new CodeSnippetTypeMember( SkeletonSnippet ) ); XPathNodeIterator it = doc.CreateNavigator().Select( "/root/data" ); while ( it.MoveNext() ) { // Work with a copy to avoid cursor movements. string key = it.Current.GetAttribute( "name", String.Empty ); if ( key != null ) { // Remove invalid characters from name chosen by the user. string name = CodeIdentifier.MakeValid( key ); // We can use a property as it's a simple object/string. CodeMemberField fld = new CodeMemberField(typeof(string), name); fld.Attributes = MemberAttributes.Const | MemberAttributes.Public; fld.InitExpression = new CodePrimitiveExpression(name); sr.Members.Add( fld ); } } string code; using (StreamReader reader = new StreamReader(codefile)) { code = reader.ReadToEnd(); } return System.Text.Encoding.ASCII.GetBytes(code); } catch (Exception e) { return System.Text.Encoding.ASCII.GetBytes(SR.XGenTool_GeneralError(e)); } finally { if (domain != null) { AppDomain.Unload(domain); } } } #endregion GenerateCode #region Registration and Installation /// <summary> /// Registers the generator. /// </summary> [ComRegisterFunction] public static void RegisterClass(Type type) { CustomTool.Register(typeof(ResXTool)); } /// <summary> /// Unregisters the generator. /// </summary> [ComUnregisterFunction] public static void UnregisterClass(Type t) { CustomTool.UnRegister(typeof(ResXTool)); } #endregion Registration and Installation } } |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-03 17:51:55
|
Update of /cvsroot/mvp-xml/Design/v1/src/CustomTools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9289/v1/src/CustomTools Added Files: XmlValidate.cs Log Message: Initial version of XmlValidate custom tool and ResX two Class tool. --- NEW FILE: XmlValidate.cs --- #region Usage /* Usage: * Add an .xml file to the project and set: * Custom Tool: XmlValidate * Custom Tool Namespace: SchemaFile.xsd[#Capitalize] * First segment is the schema to use for validation. * Optional second segment allows to use the functionality described * in http://weblogs.asp.net/cazzu/archive/2004/05/10/129106.aspx. */ #endregion Usage #region using using System; using System.Collections; using System.ComponentModel; using System.ComponentModel.Design; using System.IO; using System.Reflection; using System.Runtime.InteropServices; using System.Text; using System.Xml; using System.Xml.Schema; #endregion namespace Mvp.Xml.Design.CustomTools { /// <summary> /// Validates an XML file with an XSD schema. /// </summary> /// <remarks> /// Usage: Add an .xml file to the project and set: /// <para> /// Custom Tool: XmlValidate /// Custom Tool Namespace: SchemaFile.xsd[,SchemaFile-n,xsd]* /// </para> /// </remarks> [Guid("E14D5AEF-9DAA-420f-8927-47A3B5682069")] [CustomTool("Mvp.Xml.Validate", "MVP XML Document Validation Tool", false)] [ComVisible(true)] [VersionSupport("7.1")] [VersionSupport("7.0")] [CategorySupport(CategorySupportAttribute.CSharpCategory)] [CategorySupport(CategorySupportAttribute.VBCategory)] public class XmlValidate : CustomTool { #region GenerateCode StringBuilder _errors; /// <summary> /// Generates the output. /// </summary> protected override byte[] GenerateCode(string inputFileName, string inputFileContent) { try { _errors = new StringBuilder(); if (base.FileNameSpace == null || base.FileNameSpace == String.Empty) return System.Text.Encoding.ASCII.GetBytes( SR.XmlValidate_NoSchemaLocation); using (Stream fs = File.OpenRead(inputFileName)) { XmlValidatingReader vr = new XmlValidatingReader(new XmlTextReader(fs)); string[] schemalocations = base.FileNameSpace.Split(';'); foreach (string schemalocation in schemalocations) { if (schemalocation.Length == 0) { continue; } string path = schemalocation; // Schema location is relative to document. if (!Path.IsPathRooted(schemalocation)) { path = Path.Combine(Path.GetDirectoryName(inputFileName), schemalocation); } using (Stream xs = File.OpenRead(path)) { vr.Schemas.Add(XmlSchema.Read(xs, null)); } } vr.ValidationEventHandler += new ValidationEventHandler(OnValidate); // Validate it! while (vr.Read()) {} string errors = _errors.ToString(); if (errors.Length == 0) { return System.Text.Encoding.ASCII.GetBytes( SR.XmlValidate_Succeeded); } else { return System.Text.Encoding.ASCII.GetBytes( SR.XmlValidate_Failed(errors)); } } } catch (Exception e) { return System.Text.Encoding.ASCII.GetBytes( SR.XmlValidate_GeneralError(e)); } } private void OnValidate(object sender, ValidationEventArgs e) { _errors.AppendFormat("{0}: {1}\n", e.Severity, e.Message); } #endregion GenerateCode #region GetDefaultExtension /// <summary> /// This tool reports validation errors. /// </summary> public override string GetDefaultExtension() { return ".txt"; } #endregion GetDefaultExtension #region Registration and Installation /// <summary> /// Registers the generator. /// </summary> [ComRegisterFunction] public static void RegisterClass(Type type) { CustomTool.Register(typeof(XmlValidate)); } /// <summary> /// Unregisters the generator. /// </summary> [ComUnregisterFunction] public static void UnregisterClass(Type t) { CustomTool.UnRegister(typeof(XmlValidate)); } #endregion Registration and Installation } } |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-03 17:51:50
|
Update of /cvsroot/mvp-xml/Design/v1/tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9289/v1/tests Added Files: Mvp.Xml.Design.Tests.csproj Log Message: Initial version of XmlValidate custom tool and ResX two Class tool. --- NEW FILE: Mvp.Xml.Design.Tests.csproj --- <VisualStudioProject> <CSHARP ProjectType = "Local" ProductVersion = "7.10.3077" SchemaVersion = "2.0" ProjectGuid = "{4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}" > <Build> <Settings ApplicationIcon = "" AssemblyKeyContainerName = "" AssemblyName = "Mvp.Xml.Design.Tests" AssemblyOriginatorKeyFile = "" DefaultClientScript = "JScript" DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" OutputType = "Library" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "Mvp.Xml.Design.Tests" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" > <Config Name = "Debug" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" OutputPath = "bin\Debug\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> <Config Name = "Release" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "TRACE" DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "true" OutputPath = "bin\Release\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> </Settings> <References> <Reference Name = "System" AssemblyName = "System" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" /> <Reference Name = "System.Data" AssemblyName = "System.Data" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" /> <Reference Name = "System.XML" AssemblyName = "System.Xml" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> <Reference Name = "nunit.framework" AssemblyName = "nunit.framework" HintPath = "C:\Program Files\NUnit 2.2\bin\nunit.framework.dll" AssemblyFolderKey = "hklm\dn\nunit.framework" /> </References> </Build> <Files> <Include> <File RelPath = "AssemblyInfo.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "Customer.cs" SubType = "Code" BuildAction = "Compile" Generator = "Mvp.Xml.XGen" LastGenOutput = "Customer.Serialization.cs" /> <File RelPath = "Customer.Serialization.cs" DependentUpon = "Customer.cs" SubType = "Code" BuildAction = "Compile" AutoGen = "True" /> <File RelPath = "TestSerialization.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> </CSHARP> </VisualStudioProject> |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-03 17:51:48
|
Update of /cvsroot/mvp-xml/Design/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9289/v1/src Added Files: Mvp.Xml.Design.csproj Mvp.Xml.Design.sln Log Message: Initial version of XmlValidate custom tool and ResX two Class tool. --- NEW FILE: Mvp.Xml.Design.csproj --- <VisualStudioProject> <CSHARP ProjectType = "Local" ProductVersion = "7.10.3077" SchemaVersion = "2.0" ProjectGuid = "{A379C40D-C984-4E63-933A-BE96E9A599B7}" > <Build> <Settings ApplicationIcon = "" AssemblyKeyContainerName = "" AssemblyName = "Mvp.Xml.Design" AssemblyOriginatorKeyFile = "" DefaultClientScript = "JScript" DefaultHTMLPageLayout = "Grid" DefaultTargetSchema = "IE50" DelaySign = "false" OutputType = "Library" PreBuildEvent = "" PostBuildEvent = "" RootNamespace = "Mvp.Xml.Design" RunPostBuildEvent = "OnBuildSuccess" StartupObject = "" > <Config Name = "Debug" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "DEBUG;TRACE" DocumentationFile = "" DebugSymbols = "true" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "false" OutputPath = "..\bin\" RegisterForComInterop = "true" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> <Config Name = "Release" AllowUnsafeBlocks = "false" BaseAddress = "285212672" CheckForOverflowUnderflow = "false" ConfigurationOverrideFile = "" DefineConstants = "TRACE" DocumentationFile = "" DebugSymbols = "false" FileAlignment = "4096" IncrementalBuild = "false" NoStdLib = "false" NoWarn = "" Optimize = "true" OutputPath = "..\bin\" RegisterForComInterop = "false" RemoveIntegerChecks = "false" TreatWarningsAsErrors = "false" WarningLevel = "4" /> </Settings> <References> <Reference Name = "System" AssemblyName = "System" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.dll" /> <Reference Name = "System.Data" AssemblyName = "System.Data" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Data.dll" /> <Reference Name = "System.XML" AssemblyName = "System.Xml" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> <Reference Name = "System.Windows.Forms" AssemblyName = "System.Windows.Forms" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Windows.Forms.dll" /> <Reference Name = "envdte" AssemblyName = "EnvDTE" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\envdte.dll" /> <Reference Name = "VSLangProj" AssemblyName = "VSLangProj" HintPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\PublicAssemblies\VSLangProj.dll" AssemblyFolderKey = "hklm\publicassemblies" /> <Reference Name = "microsoft.visualstudio.designer.interfaces" AssemblyName = "Microsoft.VisualStudio.Designer.Interfaces" HintPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\microsoft.visualstudio.designer.interfaces.dll" Private = "False" /> <Reference Name = "System.Drawing" AssemblyName = "System.Drawing" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll" /> <Reference Name = "VSLangProj2" AssemblyName = "VSLangProj2" HintPath = "C:\Program Files\Microsoft Visual Studio .NET 2003\Common7\IDE\PublicAssemblies\VSLangProj2.dll" AssemblyFolderKey = "hklm\publicassemblies" /> <Reference Name = "System.Management" AssemblyName = "System.Management" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Management.dll" /> <Reference Name = "System.Configuration.Install" AssemblyName = "System.Configuration.Install" HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.1.4322\System.Configuration.Install.dll" /> </References> </Build> <Files> <Include> <File RelPath = "AssemblyInfo.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "changelog.txt" BuildAction = "Content" /> <File RelPath = "DebugUtils.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "license.txt" BuildAction = "Content" /> <File RelPath = "ProjectInstaller.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "ReflectionHelper.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "SR.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "SR.resx" DependentUpon = "SR.cs" BuildAction = "EmbeddedResource" /> <File RelPath = "CustomTools\Attributes.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\CustomTool.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\XmlValidate.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\XGen\ClassPicker.cs" SubType = "Form" BuildAction = "Compile" /> <File RelPath = "CustomTools\XGen\ClassPicker.resx" DependentUpon = "ClassPicker.cs" BuildAction = "EmbeddedResource" /> <File RelPath = "CustomTools\XGen\XGenRunner.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\XGen\XGenTool.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "CustomTools\XGen\XmlSerializerGenerator.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\IProfferService.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\Readme.txt" BuildAction = "Content" /> <File RelPath = "VisualStudio\ServiceContainer.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\Site.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\BaseCodeGenerator.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\BaseCodeGeneratorWithSite.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IObjectWithSite.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IOleServiceProvider.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IVsGeneratorProgress.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\IVsSingleFileGenerator.cs" SubType = "Code" BuildAction = "Compile" /> <File RelPath = "VisualStudio\GotDotNet\ServiceProvider.cs" SubType = "Code" BuildAction = "Compile" /> </Include> </Files> </CSHARP> </VisualStudioProject> --- NEW FILE: Mvp.Xml.Design.sln --- Microsoft Visual Studio Solution File, Format Version 8.00 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvp.Xml.Design", "Mvp.Xml.Design.csproj", "{A379C40D-C984-4E63-933A-BE96E9A599B7}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Project("{54435603-DBB4-11D2-8724-00A0C9A8B90C}") = "Mvp.Xml.Design.Setup", "..\setup\setup.vdproj", "{0836E643-A9ED-421E-8426-1CB68F125B66}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mvp.Xml.Design.Tests", "..\tests\Mvp.Xml.Design.Tests.csproj", "{4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Global GlobalSection(SolutionConfiguration) = preSolution Debug = Debug Release = Release EndGlobalSection GlobalSection(ProjectConfiguration) = postSolution {A379C40D-C984-4E63-933A-BE96E9A599B7}.Debug.ActiveCfg = Debug|.NET {A379C40D-C984-4E63-933A-BE96E9A599B7}.Debug.Build.0 = Debug|.NET {A379C40D-C984-4E63-933A-BE96E9A599B7}.Release.ActiveCfg = Release|.NET {A379C40D-C984-4E63-933A-BE96E9A599B7}.Release.Build.0 = Release|.NET {0836E643-A9ED-421E-8426-1CB68F125B66}.Debug.ActiveCfg = Debug {0836E643-A9ED-421E-8426-1CB68F125B66}.Release.ActiveCfg = Release {4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}.Debug.ActiveCfg = Debug|.NET {4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}.Debug.Build.0 = Debug|.NET {4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}.Release.ActiveCfg = Release|.NET {4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}.Release.Build.0 = Release|.NET EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution EndGlobalSection GlobalSection(ExtensibilityAddIns) = postSolution EndGlobalSection EndGlobal |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-03 17:50:40
|
Update of /cvsroot/mvp-xml/Design/v1/src/CustomTools/ResX In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8940/ResX Log Message: Directory /cvsroot/mvp-xml/Design/v1/src/CustomTools/ResX added to the repository |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-03 17:50:11
|
Update of /cvsroot/mvp-xml/Design/v2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8741/v2 Log Message: Directory /cvsroot/mvp-xml/Design/v2 added to the repository |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-01 22:40:45
|
Update of /cvsroot/mvp-xml/Design/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15685/v1/src Modified Files: changelog.txt Log Message: Initial fix of XPathNavigatorReader. Index: changelog.txt =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/changelog.txt,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- changelog.txt 21 Oct 2004 21:24:20 -0000 1.2 +++ changelog.txt 1 Jan 2005 22:40:33 -0000 1.3 @@ -1,3 +1,8 @@ +December 30, 2004 + +Added XmlValidate custom tool, that allows validation of the file against multiple schemas if necessary. + +--------------------------------------------------------- October 21, 2004 Renamed tool to XGen, added setup and test project. |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-01 22:40:45
|
Update of /cvsroot/mvp-xml/Design/v1/setup In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15685/v1/setup Modified Files: Setup.vdproj Log Message: Initial fix of XPathNavigatorReader. Index: Setup.vdproj =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/setup/Setup.vdproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Setup.vdproj 21 Oct 2004 20:42:05 -0000 1.1 +++ Setup.vdproj 1 Jan 2005 22:40:33 -0000 1.2 @@ -3,7 +3,7 @@ "VSVersion" = "3:701" "ProjectType" = "8:{2C2AF0D9-9B47-4FE5-BEF2-169778172667}" "IsWebType" = "8:FALSE" -"ProjectName" = "8:Setup" +"ProjectName" = "8:Mvp.Xml.Design.Setup" "LanguageId" = "3:1033" "CodePage" = "3:1252" "UILanguageId" = "3:1033" @@ -21,98 +21,92 @@ } "Entry" { - "MsmKey" = "8:_239E7A94FEA98D5F95EC62E8DF6F3101" - "OwnerKey" = "8:_AE778C29B6666503F07EC2E84356AB0F" - "MsmSig" = "8:_UNDEFINED" - } - "Entry" - { - "MsmKey" = "8:_239E7A94FEA98D5F95EC62E8DF6F3101" + "MsmKey" = "8:_23A75BF848673FD28D7D50DE52177FED" "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_239E7A94FEA98D5F95EC62E8DF6F3101" - "OwnerKey" = "8:_D4B04DBA1B9EDEBA721E125CC23FC11B" + "MsmKey" = "8:_2F9F309A6862947B882A4CE64ABC211E" + "OwnerKey" = "8:_68C574C038A55708272F4D6A2BF91103" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_29F8D498C7A3FEB6FF4F3F90FB182464" - "OwnerKey" = "8:_AE778C29B6666503F07EC2E84356AB0F" + "MsmKey" = "8:_2F9F309A6862947B882A4CE64ABC211E" + "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_5A4E0F84B30D7F9BFFA5E476A57FC45D" - "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" + "MsmKey" = "8:_2F9F309A6862947B882A4CE64ABC211E" + "OwnerKey" = "8:_23A75BF848673FD28D7D50DE52177FED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A350DC57C2A1328AAA44151FCA1E6499" - "OwnerKey" = "8:_D2A8C5E55F98D4185C84D969DE436814" + "MsmKey" = "8:_5BC4577799522D7C325B82EA353EA077" + "OwnerKey" = "8:_2F9F309A6862947B882A4CE64ABC211E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A350DC57C2A1328AAA44151FCA1E6499" - "OwnerKey" = "8:_239E7A94FEA98D5F95EC62E8DF6F3101" + "MsmKey" = "8:_63EF651D7A7383AC77812CF536C639E4" + "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_A3AA8BD781FA8F99E004B89C0FE83E62" - "OwnerKey" = "8:_239E7A94FEA98D5F95EC62E8DF6F3101" + "MsmKey" = "8:_68C574C038A55708272F4D6A2BF91103" + "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_ACAB07C6CF708652BFFF2C60D6E1CBF4" - "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" + "MsmKey" = "8:_68C574C038A55708272F4D6A2BF91103" + "OwnerKey" = "8:_23A75BF848673FD28D7D50DE52177FED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AE778C29B6666503F07EC2E84356AB0F" - "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" + "MsmKey" = "8:_C5DEE926152443A19A4109C341A7BDC4" + "OwnerKey" = "8:_63EF651D7A7383AC77812CF536C639E4" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_AE778C29B6666503F07EC2E84356AB0F" - "OwnerKey" = "8:_D4B04DBA1B9EDEBA721E125CC23FC11B" + "MsmKey" = "8:_C5DEE926152443A19A4109C341A7BDC4" + "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D2A8C5E55F98D4185C84D969DE436814" - "OwnerKey" = "8:_239E7A94FEA98D5F95EC62E8DF6F3101" + "MsmKey" = "8:_C5DEE926152443A19A4109C341A7BDC4" + "OwnerKey" = "8:_23A75BF848673FD28D7D50DE52177FED" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_D4B04DBA1B9EDEBA721E125CC23FC11B" - "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" + "MsmKey" = "8:_E188CC4893F17091E6871EBC2531954B" + "OwnerKey" = "8:_2F9F309A6862947B882A4CE64ABC211E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F54884809E164B9A8A09321F5CAE9F52" - "OwnerKey" = "8:_5A4E0F84B30D7F9BFFA5E476A57FC45D" + "MsmKey" = "8:_E188CC4893F17091E6871EBC2531954B" + "OwnerKey" = "8:_F2320EAD13D631D23CDCC23F6498CB89" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F54884809E164B9A8A09321F5CAE9F52" - "OwnerKey" = "8:_2090D92F765D47F7BADD9F4AADA8FDA1" + "MsmKey" = "8:_F2320EAD13D631D23CDCC23F6498CB89" + "OwnerKey" = "8:_2F9F309A6862947B882A4CE64ABC211E" "MsmSig" = "8:_UNDEFINED" } "Entry" { - "MsmKey" = "8:_F54884809E164B9A8A09321F5CAE9F52" - "OwnerKey" = "8:_D4B04DBA1B9EDEBA721E125CC23FC11B" + "MsmKey" = "8:_F857E9BBF3D5A614D5EBCB764D363287" + "OwnerKey" = "8:_68C574C038A55708272F4D6A2BF91103" "MsmSig" = "8:_UNDEFINED" } } @@ -222,20 +216,20 @@ } "File" { - "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_239E7A94FEA98D5F95EC62E8DF6F3101" + "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_23A75BF848673FD28D7D50DE52177FED" { "AssemblyRegister" = "3:1" "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:EnvDTE, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyAsmDisplayName" = "8:VSLangProj2, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_239E7A94FEA98D5F95EC62E8DF6F3101" + "_23A75BF848673FD28D7D50DE52177FED" { - "Name" = "8:EnvDTE.dll" + "Name" = "8:VSLangProj2.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:EnvDTE.dll" + "SourcePath" = "8:VSLangProj2.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" @@ -253,10 +247,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_29F8D498C7A3FEB6FF4F3F90FB182464" + "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_2F9F309A6862947B882A4CE64ABC211E" { - "SourcePath" = "8:vslangproj.tlb" - "TargetName" = "8:vslangproj.tlb" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:EnvDTE, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "ScatterAssemblies" + { + "_2F9F309A6862947B882A4CE64ABC211E" + { + "Name" = "8:EnvDTE.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:EnvDTE.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" "Condition" = "8:" @@ -268,26 +273,15 @@ "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" - "Register" = "3:2" + "Register" = "3:1" "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_5A4E0F84B30D7F9BFFA5E476A57FC45D" + "{A582A373-4685-4296-BEFE-614B80A702C3}:_5BC4577799522D7C325B82EA353EA077" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Designer.Interfaces, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_5A4E0F84B30D7F9BFFA5E476A57FC45D" - { - "Name" = "8:Microsoft.VisualStudio.Designer.Interfaces.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:Microsoft.VisualStudio.Designer.Interfaces.dll" - "TargetName" = "8:" + "SourcePath" = "8:DTE.OLB" + "TargetName" = "8:DTE.OLB" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" "Condition" = "8:" @@ -304,20 +298,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_A350DC57C2A1328AAA44151FCA1E6499" + "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_63EF651D7A7383AC77812CF536C639E4" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" - "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:Microsoft.VisualStudio.Designer.Interfaces, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_A350DC57C2A1328AAA44151FCA1E6499" + "_63EF651D7A7383AC77812CF536C639E4" { - "Name" = "8:stdole.dll" + "Name" = "8:Microsoft.VisualStudio.Designer.Interfaces.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:stdole.dll" + "SourcePath" = "8:Microsoft.VisualStudio.Designer.Interfaces.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" @@ -335,10 +329,21 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_A3AA8BD781FA8F99E004B89C0FE83E62" + "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_68C574C038A55708272F4D6A2BF91103" { - "SourcePath" = "8:DTE.OLB" - "TargetName" = "8:DTE.OLB" + "AssemblyRegister" = "3:1" + "AssemblyIsInGAC" = "11:FALSE" + "AssemblyAsmDisplayName" = "8:VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "ScatterAssemblies" + { + "_68C574C038A55708272F4D6A2BF91103" + { + "Name" = "8:VSLangProj.dll" + "Attributes" = "3:512" + } + } + "SourcePath" = "8:VSLangProj.dll" + "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" "Condition" = "8:" @@ -355,40 +360,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{A582A373-4685-4296-BEFE-614B80A702C3}:_ACAB07C6CF708652BFFF2C60D6E1CBF4" - { - "SourcePath" = "8:Mvp.Xml.Design.tlb" - "TargetName" = "8:Mvp.Xml.Design.tlb" - "Tag" = "8:" - "Folder" = "8:_0E15C1344F794F8F931126EC4B60D776" - "Condition" = "8:" - "Transitive" = "11:FALSE" - "Vital" = "11:TRUE" - "ReadOnly" = "11:FALSE" - "Hidden" = "11:FALSE" - "System" = "11:FALSE" - "Permanent" = "11:FALSE" - "SharedLegacy" = "11:FALSE" - "PackageAs" = "3:1" - "Register" = "3:2" - "Exclude" = "11:FALSE" - "IsDependency" = "11:TRUE" - "IsolateTo" = "8:" - } - "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_AE778C29B6666503F07EC2E84356AB0F" + "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_E188CC4893F17091E6871EBC2531954B" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:VSLangProj, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" + "AssemblyIsInGAC" = "11:TRUE" + "AssemblyAsmDisplayName" = "8:stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_AE778C29B6666503F07EC2E84356AB0F" + "_E188CC4893F17091E6871EBC2531954B" { - "Name" = "8:VSLangProj.dll" + "Name" = "8:stdole.dll" "Attributes" = "3:512" } } - "SourcePath" = "8:VSLangProj.dll" + "SourcePath" = "8:stdole.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" @@ -406,20 +391,20 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_D2A8C5E55F98D4185C84D969DE436814" + "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_F2320EAD13D631D23CDCC23F6498CB89" { "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:TRUE" + "AssemblyIsInGAC" = "11:FALSE" "AssemblyAsmDisplayName" = "8:Office, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" "ScatterAssemblies" { - "_D2A8C5E55F98D4185C84D969DE436814" + "_F2320EAD13D631D23CDCC23F6498CB89" { - "Name" = "8:Office.dll" + "Name" = "8:Office.DLL" "Attributes" = "3:512" } } - "SourcePath" = "8:Office.dll" + "SourcePath" = "8:Office.DLL" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" @@ -437,21 +422,10 @@ "IsDependency" = "11:TRUE" "IsolateTo" = "8:" } - "{FB480208-1853-44D0-9ABD-A3B734C3FAAA}:_D4B04DBA1B9EDEBA721E125CC23FC11B" + "{A582A373-4685-4296-BEFE-614B80A702C3}:_F857E9BBF3D5A614D5EBCB764D363287" { - "AssemblyRegister" = "3:1" - "AssemblyIsInGAC" = "11:FALSE" - "AssemblyAsmDisplayName" = "8:VSLangProj2, Version=7.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" - "ScatterAssemblies" - { - "_D4B04DBA1B9EDEBA721E125CC23FC11B" - { - "Name" = "8:VSLangProj2.dll" - "Attributes" = "3:512" - } - } - "SourcePath" = "8:VSLangProj2.dll" - "TargetName" = "8:" + "SourcePath" = "8:vslangproj.tlb" + "TargetName" = "8:vslangproj.tlb" "Tag" = "8:" "Folder" = "8:_8687631A331A49F6969AFDB32E5AED77" "Condition" = "8:" @@ -463,7 +437,7 @@ "Permanent" = "11:FALSE" "SharedLegacy" = "11:FALSE" "PackageAs" = "3:1" - "Register" = "3:1" + "Register" = "3:2" "Exclude" = "11:TRUE" "IsDependency" = "11:TRUE" "IsolateTo" = "8:" @@ -1043,7 +1017,7 @@ } "MergeModule" { - "{35A69C6E-5BA4-440D-803D-762B59A45393}:_F54884809E164B9A8A09321F5CAE9F52" + "{35A69C6E-5BA4-440D-803D-762B59A45393}:_C5DEE926152443A19A4109C341A7BDC4" { "UseDynamicProperties" = "11:TRUE" "IsDependency" = "11:TRUE" @@ -1090,7 +1064,7 @@ } "{8062640A-2EEE-46E9-AB67-688E9A886E9F}:_2090D92F765D47F7BADD9F4AADA8FDA1" { - "SourcePath" = "8:..\\src\\obj\\Debug\\Mvp.Xml.Design.dll" + "SourcePath" = "8:..\\src\\obj\\Release\\Mvp.Xml.Design.dll" "TargetName" = "8:" "Tag" = "8:" "Folder" = "8:_0E15C1344F794F8F931126EC4B60D776" |
From: Daniel C. \(kzu\) <dca...@us...> - 2005-01-01 22:38:14
|
Update of /cvsroot/mvp-xml/Common/v1/src/XPath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15187/v1/src/XPath Modified Files: XPathNavigatorReader.cs Log Message: Initial fix of XPathNavigatorReader. Index: XPathNavigatorReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XPath/XPathNavigatorReader.cs,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- XPathNavigatorReader.cs 18 Dec 2004 04:47:22 -0000 1.6 +++ XPathNavigatorReader.cs 1 Jan 2005 22:38:04 -0000 1.7 @@ -137,7 +137,7 @@ get { return _fragment || - _navigator.NodeType == XPathNodeType.ProcessingInstruction || + //_navigator.NodeType == XPathNodeType.ProcessingInstruction || _navigator.NodeType == XPathNodeType.Comment; } } @@ -637,7 +637,8 @@ { // If XML fragment is not allowed and we're already at the // original location, and the were no children, this is an empty root. - if (!AllowFragment && _navigator.IsEmptyElement) + if (!AllowFragment && + (_navigator.IsEmptyElement || _navigator.NodeType != XPathNodeType.Element)) { _eof = true; _state = ReadState.EndOfFile; |
From: Oleg T. <he...@us...> - 2004-12-22 15:04:10
|
Update of /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17690/v1/test/XPathNavigatorReaderTests Modified Files: Tests.cs Log Message: Just add the word "evil" to break it! Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests/Tests.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- Tests.cs 18 Dec 2004 05:11:38 -0000 1.4 +++ Tests.cs 22 Dec 2004 15:04:02 -0000 1.5 @@ -54,7 +54,7 @@ [Test] public void OlegEvilTest() { - string xml = @"<foo><?pi text?></foo>"; + string xml = @"<foo><?pi text?>evil</foo>"; XPathDocument doc = new XPathDocument(new StringReader(xml)); XPathNodeIterator ni = doc.CreateNavigator().Select("//processing-instruction()"); |
From: Oleg T. <he...@us...> - 2004-12-22 14:25:14
|
Update of /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10128/v1/test/XmlBaseAwareXmlTextReaderTests Modified Files: Tests.cs test.xml Added Files: relativeTest.xml Log Message: Split xml:base tests - relative URI cannot be used when reading document from a stream with no base URI. --- NEW FILE: relativeTest.xml --- (This appears to be a binary file; contents omitted.) Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests/Tests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Tests.cs 18 Dec 2004 05:00:39 -0000 1.3 +++ Tests.cs 22 Dec 2004 14:25:03 -0000 1.4 @@ -66,13 +66,13 @@ [Test] public void ReaderWithPath() { - XmlTextReader r = new XmlBaseAwareXmlTextReader(@"..\..\XmlBaseAwareXmlTextReaderTests\test.xml"); + XmlTextReader r = new XmlBaseAwareXmlTextReader(@"..\..\XmlBaseAwareXmlTextReaderTests\relativeTest.xml"); r.WhitespaceHandling = WhitespaceHandling.None; XPathDocument doc = new XPathDocument(r); XPathNavigator nav = doc.CreateNavigator(); XPathNodeIterator ni = nav.Select("/catalog"); ni.MoveNext(); - Assert.IsTrue(ni.Current.BaseURI.EndsWith("/XmlBaseAwareXmlTextReaderTests/test.xml")); + Assert.IsTrue(ni.Current.BaseURI.EndsWith("/XmlBaseAwareXmlTextReaderTests/relativeTest.xml")); ni = nav.Select("/catalog/relative/relativenode"); ni.MoveNext(); Console.WriteLine(ni.Current.BaseURI); Index: test.xml =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests/test.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- test.xml 18 Dec 2004 04:58:13 -0000 1.3 +++ test.xml 22 Dec 2004 14:25:04 -0000 1.4 @@ -12,8 +12,5 @@ <d></d> <!-- comment --> </b> - </a> - <relative xml:base="subfolder/second.xml"> - <relativenode /> - </relative> + </a> </catalog> |
From: Oleg T. <he...@us...> - 2004-12-22 14:25:12
|
Update of /cvsroot/mvp-xml/Common/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10128/v1/test Modified Files: CommonTest.csproj Log Message: Split xml:base tests - relative URI cannot be used when reading document from a stream with no base URI. Index: CommonTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/CommonTest.csproj,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- CommonTest.csproj 14 Nov 2004 01:24:30 -0000 1.3 +++ CommonTest.csproj 22 Dec 2004 14:25:03 -0000 1.4 @@ -248,6 +248,10 @@ BuildAction = "Compile" /> <File + RelPath = "XmlBaseAwareXmlTextReaderTests\relativeTest.xml" + BuildAction = "EmbeddedResource" + /> + <File RelPath = "XmlBaseAwareXmlTextReaderTests\test.xml" BuildAction = "EmbeddedResource" /> |
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:16:49
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7798/v1/test Modified Files: XIncludeTest.csproj Log Message: Index: XIncludeTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeTest.csproj,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- XIncludeTest.csproj 7 Nov 2004 14:49:57 -0000 1.16 +++ XIncludeTest.csproj 18 Dec 2004 05:16:38 -0000 1.17 @@ -90,11 +90,35 @@ AssemblyName = "System.Xml" HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll" /> + <Reference + Name = "nunit.framework" + AssemblyName = "nunit.framework" + HintPath = "C:\Program Files\NUnit 2.2\bin\nunit.framework.dll" + AssemblyFolderKey = "hklm\dn\nunit.framework" + /> + <Reference + Name = "XInclude" + Project = "{3750FAB1-FD0E-425A-9DAA-87543A556319}" + Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" + /> </References> </Build> <Files> <Include> <File + RelPath = "book.xml" + BuildAction = "Content" + /> + <File + RelPath = "chap1.xml" + BuildAction = "Content" + /> + <File + RelPath = "SimpleTest.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "Elliotte_Rusty_HaroldTests.cs" SubType = "Code" BuildAction = "Compile" |
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:12:08
|
Update of /cvsroot/mvp-xml/Prototypes/SGen/SGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6976/SGen/SGen Modified Files: XmlSerializerGenerator.cs Log Message: Index: XmlSerializerGenerator.cs =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen/XmlSerializerGenerator.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XmlSerializerGenerator.cs 14 Sep 2004 13:40:10 -0000 1.2 +++ XmlSerializerGenerator.cs 18 Dec 2004 05:11:53 -0000 1.3 @@ -143,7 +143,7 @@ _reader = reader; }} - /// <summary>Constructs the serializer with a pre-writer reader.</summary> + /// <summary>Constructs the serializer with a pre-built writer.</summary> public {0}({2} writer) {{ _writer = writer; @@ -284,9 +284,12 @@ // Create a delegate for the event to expose. CodeTypeDelegate del = new CodeTypeDelegate( objectread + "DeserializedHandler"); + char[] name = objectread.ToCharArray(); + name[0] = Char.ToLower(name[0]); del.Parameters.Add(new CodeParameterDeclarationExpression( readm.Groups[ReadMethodReturnType].Value, - objectread.ToLower())); + new string(name))); + del.Comments.Add(new CodeCommentStatement("/// <remarks/>", true)); ns.Types.Add(del); // Expose event. @@ -294,6 +297,7 @@ ev.Name = objectread + "Deserialized"; ev.Attributes = MemberAttributes.Public; ev.Type = new CodeTypeReference(del.Name); + ev.Comments.Add(new CodeCommentStatement("/// <remarks/>", true)); reader.Members.Add(ev); // Override base method. @@ -316,8 +320,8 @@ reader.Members.Add(new CodeSnippetTypeMember( String.Format(TemplateReadMethod, type.FullName, readmatch.Groups[PublicMethodName].Value))); - // Turn original public method into protected - output = PublicRead.Replace(output, "protected object ${method}"); + // Turn original public method into internal protected + output = PublicRead.Replace(output, "protected internal object ${method}"); // Turn all private methods into protected virtual, as they are overriden // by the custom event rising reader. @@ -340,8 +344,8 @@ String.Format(TemplateWriteMethod, type.FullName, writematch.Groups[PublicMethodName].Value))); - // Turn original public method into protected - output = PublicWrite.Replace(output, "protected void ${method}"); + // Turn original public method into internal protected + output = PublicWrite.Replace(output, "protected internal void ${method}"); #endregion Create custom writer |
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:12:08
|
Update of /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6976/SGen/SGen.Tests Modified Files: OrderSerialization.cs PurchaseOrder.cs PurchaseOrder.xsd PurchaseOrder.xsx Log Message: Index: PurchaseOrder.xsx =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/PurchaseOrder.xsx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PurchaseOrder.xsx 14 Sep 2004 13:40:10 -0000 1.2 +++ PurchaseOrder.xsx 18 Dec 2004 05:11:52 -0000 1.3 @@ -8,9 +8,9 @@ </Items_XmlElement> </Order_XmlElement> <Customer_XmlElement left="19023" top="1667" width="5292" height="2963" selected="0" zOrder="11" index="1" expanded="1"> - <Category_XmlElement left="19023" top="5138" width="5292" height="847" selected="0" zOrder="15" index="2" expanded="1"> - <_x0028_Category_x0029__XmlSimpleType left="19023" top="6493" width="5292" height="2963" selected="0" zOrder="19" index="0" expanded="1" /> + <Category_XmlElement left="19023" top="5138" width="5292" height="847" selected="0" zOrder="13" index="2" expanded="1"> + <_x0028_Category_x0029__XmlSimpleType left="19023" top="6493" width="5292" height="2963" selected="0" zOrder="16" index="0" expanded="1" /> </Category_XmlElement> </Customer_XmlElement> - <Item_XmlElement left="12488" top="1562" width="5292" height="2963" selected="0" zOrder="13" index="2" expanded="1" /> + <Item_XmlElement left="12488" top="1562" width="5292" height="2963" selected="0" zOrder="19" index="2" expanded="1" /> </XSDDesignerLayout> \ No newline at end of file Index: PurchaseOrder.xsd =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/PurchaseOrder.xsd,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- PurchaseOrder.xsd 14 Sep 2004 13:40:10 -0000 1.2 +++ PurchaseOrder.xsd 18 Dec 2004 05:11:52 -0000 1.3 @@ -17,6 +17,7 @@ <xs:attribute name="Id" type="xs:string" /> <xs:attribute name="Ordered" type="xs:date" /> <xs:attribute name="Shipped" type="xs:date" /> + <xs:attribute name="Version" type="xs:string" fixed="1.0" use="required" /> </xs:complexType> </xs:element> <xs:element name="Customer"> Index: OrderSerialization.cs =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/OrderSerialization.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- OrderSerialization.cs 14 Sep 2004 13:40:10 -0000 1.2 +++ OrderSerialization.cs 18 Dec 2004 05:11:52 -0000 1.3 @@ -86,7 +86,7 @@ SGen.Tests.Order o = new SGen.Tests.Order(); SGen.Tests.Item[] a_1 = null; int ca_1 = 0; - bool[] paramsRead = new bool[5]; + bool[] paramsRead = new bool[6]; while (Reader.MoveToNextAttribute()) { if (!paramsRead[2] && ((object) Reader.LocalName == (object)id3_Id && (object) Reader.NamespaceURI == (object)id4_Item)) { o.@Id = Reader.Value; @@ -102,6 +102,10 @@ paramsRead[4] = true; o.@ShippedSpecified = true; } + else if (!paramsRead[5] && ((object) Reader.LocalName == (object)id7_Version && (object) Reader.NamespaceURI == (object)id4_Item)) { + o.@Version = Reader.Value; + paramsRead[5] = true; + } else if (!IsXmlnsAttribute(Reader.Name)) { UnknownNode((object)o); } @@ -115,11 +119,11 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (!paramsRead[0] && ((object) Reader.LocalName == (object)id7_Customer && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (!paramsRead[0] && ((object) Reader.LocalName == (object)id8_Customer && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Customer = Read2_Customer(false, true); paramsRead[0] = true; } - else if (((object) Reader.LocalName == (object)id8_Items && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (((object) Reader.LocalName == (object)id9_Items && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { if (!ReadNull()) { SGen.Tests.Item[] a_1_0 = null; int ca_1_0 = 0; @@ -131,7 +135,7 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (((object) Reader.LocalName == (object)id9_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (((object) Reader.LocalName == (object)id10_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { a_1_0 = (SGen.Tests.Item[])EnsureArrayIndex(a_1_0, ca_1_0, typeof(SGen.Tests.Item));a_1_0[ca_1_0++] = Read5_Item(false, true); } else { @@ -166,7 +170,7 @@ if (isNullable && ReadNull()) return null; if (checkType) { System.Xml.XmlQualifiedName t = GetXsiType(); - if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id7_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id8_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) ; else throw CreateUnknownTypeException((System.Xml.XmlQualifiedName)t); @@ -187,15 +191,15 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (!paramsRead[0] && ((object) Reader.LocalName == (object)id10_FirstName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (!paramsRead[0] && ((object) Reader.LocalName == (object)id11_FirstName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@FirstName = Reader.ReadElementString(); paramsRead[0] = true; } - else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id11_LastName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id12_LastName && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@LastName = Reader.ReadElementString(); paramsRead[1] = true; } - else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id12_Category && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id13_Category && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Category = Read3_CustomerCategory(Reader.ReadElementString()); paramsRead[2] = true; } @@ -230,17 +234,17 @@ return ReadTypedPrimitive(new System.Xml.XmlQualifiedName("anyType", "http://www.w3.org/2001/XMLSchema")); else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id1_Order && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) return Read1_Order(isNullable, false); - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id9_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id10_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) return Read5_Item(isNullable, false); - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id7_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id8_Customer && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) return Read2_Customer(isNullable, false); - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id13_CustomerCategory && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id14_CustomerCategory && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { Reader.ReadStartElement(); object e = Read3_CustomerCategory(Reader.ReadString()); ReadEndElement(); return e; } - else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id14_ArrayOfItem && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id15_ArrayOfItem && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) { SGen.Tests.Item[] a = null; if (!ReadNull()) { SGen.Tests.Item[] z_0_0 = null; @@ -253,7 +257,7 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (((object) Reader.LocalName == (object)id9_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (((object) Reader.LocalName == (object)id10_Item && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { z_0_0 = (SGen.Tests.Item[])EnsureArrayIndex(z_0_0, cz_0_0, typeof(SGen.Tests.Item));z_0_0[cz_0_0++] = Read5_Item(false, true); } else { @@ -306,7 +310,7 @@ if (isNullable && ReadNull()) return null; if (checkType) { System.Xml.XmlQualifiedName t = GetXsiType(); - if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id9_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) + if (t == null || ((object) ((System.Xml.XmlQualifiedName)t).Name == (object)id10_Item && (object) ((System.Xml.XmlQualifiedName)t).Namespace == (object)id2_httptempuriorgPurchaseOrderxsd)) ; else throw CreateUnknownTypeException((System.Xml.XmlQualifiedName)t); @@ -327,15 +331,15 @@ Reader.MoveToContent(); while (Reader.NodeType != System.Xml.XmlNodeType.EndElement) { if (Reader.NodeType == System.Xml.XmlNodeType.Element) { - if (!paramsRead[0] && ((object) Reader.LocalName == (object)id15_SKU && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + if (!paramsRead[0] && ((object) Reader.LocalName == (object)id16_SKU && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@SKU = Reader.ReadElementString(); paramsRead[0] = true; } - else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id16_Quantity && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[1] && ((object) Reader.LocalName == (object)id17_Quantity && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Quantity = Reader.ReadElementString(); paramsRead[1] = true; } - else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id17_Price && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { + else if (!paramsRead[2] && ((object) Reader.LocalName == (object)id18_Price && (object) Reader.NamespaceURI == (object)id2_httptempuriorgPurchaseOrderxsd)) { o.@Price = Reader.ReadElementString(); paramsRead[2] = true; } @@ -372,42 +376,44 @@ return (object)o; } - System.String id11_LastName; - System.String id8_Items; - System.String id7_Customer; - System.String id13_CustomerCategory; - System.String id15_SKU; + System.String id9_Items; + System.String id17_Quantity; + System.String id8_Customer; + System.String id14_CustomerCategory; + System.String id16_SKU; System.String id3_Id; - System.String id9_Item; - System.String id17_Price; + System.String id10_Item; + System.String id18_Price; System.String id5_Ordered; - System.String id4_Item; - System.String id16_Quantity; - System.String id12_Category; + System.String id7_Version; + System.String id12_LastName; + System.String id13_Category; System.String id1_Order; System.String id2_httptempuriorgPurchaseOrderxsd; System.String id6_Shipped; - System.String id14_ArrayOfItem; - System.String id10_FirstName; + System.String id4_Item; + System.String id15_ArrayOfItem; + System.String id11_FirstName; protected override void InitIDs() { - id11_LastName = Reader.NameTable.Add(@"LastName"); - id8_Items = Reader.NameTable.Add(@"Items"); - id7_Customer = Reader.NameTable.Add(@"Customer"); - id13_CustomerCategory = Reader.NameTable.Add(@"CustomerCategory"); - id15_SKU = Reader.NameTable.Add(@"SKU"); + id9_Items = Reader.NameTable.Add(@"Items"); + id17_Quantity = Reader.NameTable.Add(@"Quantity"); + id8_Customer = Reader.NameTable.Add(@"Customer"); + id14_CustomerCategory = Reader.NameTable.Add(@"CustomerCategory"); + id16_SKU = Reader.NameTable.Add(@"SKU"); id3_Id = Reader.NameTable.Add(@"Id"); - id9_Item = Reader.NameTable.Add(@"Item"); - id17_Price = Reader.NameTable.Add(@"Price"); + id10_Item = Reader.NameTable.Add(@"Item"); + id18_Price = Reader.NameTable.Add(@"Price"); id5_Ordered = Reader.NameTable.Add(@"Ordered"); - id4_Item = Reader.NameTable.Add(@""); - id16_Quantity = Reader.NameTable.Add(@"Quantity"); - id12_Category = Reader.NameTable.Add(@"Category"); + id7_Version = Reader.NameTable.Add(@"Version"); + id12_LastName = Reader.NameTable.Add(@"LastName"); + id13_Category = Reader.NameTable.Add(@"Category"); id1_Order = Reader.NameTable.Add(@"Order"); id2_httptempuriorgPurchaseOrderxsd = Reader.NameTable.Add(@"http://tempuri.org/PurchaseOrder.xsd"); id6_Shipped = Reader.NameTable.Add(@"Shipped"); - id14_ArrayOfItem = Reader.NameTable.Add(@"ArrayOfItem"); - id10_FirstName = Reader.NameTable.Add(@"FirstName"); + id4_Item = Reader.NameTable.Add(@""); + id15_ArrayOfItem = Reader.NameTable.Add(@"ArrayOfItem"); + id11_FirstName = Reader.NameTable.Add(@"FirstName"); } } public class Writer : System.Xml.Serialization.XmlSerializationWriter { @@ -434,6 +440,9 @@ if (o.ShippedSpecified) { WriteAttribute(@"Shipped", @"", FromDate((System.DateTime)o.@Shipped)); } + if ((System.String)o.@Version != @"1.0") { + WriteAttribute(@"Version", @"", (System.String)o.@Version); + } Write2_Customer(@"Customer", @"http://tempuri.org/PurchaseOrder.xsd", ((SGen.Tests.Customer)o.@Customer), false, false); { SGen.Tests.Item[] a = (SGen.Tests.Item[])((SGen.Tests.Item[])o.@Items); Index: PurchaseOrder.cs =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.Tests/PurchaseOrder.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- PurchaseOrder.cs 14 Sep 2004 13:37:07 -0000 1.1 +++ PurchaseOrder.cs 18 Dec 2004 05:11:52 -0000 1.2 @@ -82,5 +82,10 @@ /// <remarks/> [System.Xml.Serialization.XmlIgnoreAttribute()] public bool ShippedSpecified; + + /// <remarks/> + [System.Xml.Serialization.XmlAttributeAttribute()] + [System.ComponentModel.DefaultValueAttribute("1.0")] + public string Version = "1.0"; } } |