Menu
▾
▴
mvp-xml-cvs — Mailing list for CVS commit messages.
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: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:12:04
|
Update of /cvsroot/mvp-xml/Prototypes/SGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6976/SGen Modified Files: SGen.suo Log Message: Index: SGen.suo =================================================================== RCS file: /cvsroot/mvp-xml/Prototypes/SGen/SGen.suo,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 Binary files /tmp/cvs4Wri7a and /tmp/cvsHnlZjz differ |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:11:57
|
Update of /cvsroot/mvp-xml/Design/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6940/v1/src Modified Files: AssemblyInfo.cs Design.csproj Design.sln SR.cs SR.resx Log Message: Index: Design.csproj =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/Design.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Design.csproj 21 Oct 2004 20:51:56 -0000 1.2 +++ Design.csproj 18 Dec 2004 05:11:45 -0000 1.3 @@ -175,6 +175,21 @@ BuildAction = "Compile" /> <File + RelPath = "CustomTools\ResX\ResX2Cs.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "CustomTools\ResX\ResX2CsConstants.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File + RelPath = "CustomTools\ResX\ResXTool.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "CustomTools\XGen\ClassPicker.cs" SubType = "Form" BuildAction = "Compile" Index: Design.sln =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/Design.sln,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Design.sln 21 Oct 2004 21:04:10 -0000 1.3 +++ Design.sln 18 Dec 2004 05:11:45 -0000 1.4 @@ -7,7 +7,7 @@ ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Design.Tests", "..\Design.Tests\Design.Tests.csproj", "{4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Design.Tests", "..\tests\Design.Tests.csproj", "{4C7101B3-6736-46B1-B1AD-9FE4E2F685D5}" ProjectSection(ProjectDependencies) = postProject EndProjectSection EndProject Index: SR.cs =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/SR.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SR.cs 21 Oct 2004 20:51:56 -0000 1.2 +++ SR.cs 18 Dec 2004 05:11:45 -0000 1.3 @@ -67,9 +67,9 @@ } /// <summary>An error occurrent, and it's received as a parameter.</summary> - public static string XGenTool_GeneralError(object arg0) + public static string CustomTool_GeneralError(object arg0) { - return SR.GetString("XGenTool_GeneralError", arg0); + return SR.GetString("CustomTool_GeneralError", arg0); } Index: SR.resx =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/SR.resx,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- SR.resx 21 Oct 2004 20:51:56 -0000 1.2 +++ SR.resx 18 Dec 2004 05:11:45 -0000 1.3 @@ -71,164 +71,10 @@ <value>Type '{0}' doesn't inherit from required base class '{1}'.</value> <comment>Type received as the first parameter does not inherit from the base class passed as the second parameter.</comment> </data> - <data name="ValueBinder_InvalidExpression" type="System.String" mimetype="System.String"> - <value>Expression '{0}' is invalid. Check .NET documentation for the DataBinder.Eval expression syntax.</value> - <comment>The expression receivedz in the first parameter is not in the expected format.</comment> - </data> - <data name="ValueBinder_MemberNotFound" type="System.String" mimetype="System.String"> - <value>Field or property '{0}' was not found in type '{1}'. Expression being evaluated was '{2}', for target '{3}'.</value> - <comment>First parameter is the field or property name, next the type where it's missing. Finally, the full expression and the originating target for which the expression was being evaluated.</comment> - </data> - <data name="ValueBinder_MethodArgumentsInvalid" type="System.String" mimetype="System.String"> - <value>Method '{0}' doesn't match the arguments received. Expression being evaluated was '{1}', for target '{2}'.</value> - <comment>First parameter is the method name name, next the full expression and the originating target for which the expression was being evaluated.</comment> - </data> - <data name="ValueBinder_IndexNotNumber" type="System.String" mimetype="System.String"> - <value>Argument '{0}' is not a valid number. </value> - <comment>Receives the indexer value that couldn't be converted to Int32.</comment> - </data> - <data name="ValueBinder_IndexEnumInvalid" type="System.String" mimetype="System.String"> - <value>Enum value '{0}' is invalid.</value> - <comment>Receives the full enum indexer that failed.</comment> - </data> - <data name="ValueBinder_NoIndexerFound" type="System.String" mimetype="System.String"> - <value>Type '{0}' doesn't have an indexer. Expression being evaluated was '{1}'.</value> - <comment>Receives the type that doesn't have the indexer, and the full expression.</comment> - </data> - <data name="ValueBinder_CantConvertValue" type="System.String" mimetype="System.String"> - <value>Value of type '{0}' can't be converted to type '{1}' expected by member '{2}'.</value> - <comment>Receives incoming value type, expected type and member name.</comment> - </data> - <data name="ValueBinder_CantAssignToMethod" type="System.String" mimetype="System.String"> - <value>Can't assign a value to a method return value. Expression being evaluated was '{0}'.</value> - <comment>{0}=full expression. The last segment of the expression is a method call, and the user tries to set a value on it.</comment> - </data> - <data name="Embedded_Success" type="System.String" mimetype="System.String"> - <value>Embedded resources generated.</value> - <comment>Sucess message.</comment> - </data> - <data name="Embedded_Error" type="System.String" mimetype="System.String"> - <value>#error Couldn't generate resource. -/* -{0} -*/</value> - <comment>An error occurrent, and it's received as a parameter.</comment> - </data> - <data name="Embedded_NoLocaleDefined" type="System.String" mimetype="System.String"> - <value>The file doesn't contain a valid locale in its name.</value> - <comment>The file can't be used to generate a localized resource.</comment> - </data> - <data name="Embedded_CantFindMain" type="System.String" mimetype="System.String"> - <value>Main resource file for this localized version wasn't found.</value> - <comment>Can't find the main file resource.</comment> - </data> - <data name="Embedded_CantFindMainClass" type="System.String" mimetype="System.String"> - <value>Parent main resource file for this localized version was found, but its corresponding resource class wasn't. - Check that its CustomTool property is set to the appropriate generator.</value> - <comment>Can't find the main file resource class.</comment> - </data> - <data name="ValueEditor_CantConvertValue" type="System.String" mimetype="System.String"> - <value>Value of type '{0}' can't be converted to type '{1}' expected by argument.</value> - <comment>Receives incoming value type and expected type.</comment> - </data> - <data name="ValueEditor_InvalidValue" type="System.String" mimetype="System.String"> - <value>The value specified is invalid.</value> - <comment></comment> - </data> - <data name="Step_ShowHelp" type="System.String" mimetype="System.String"> - <value>Show Help</value> - <comment>Allows the user to click and see additional help.</comment> - </data> - <data name="IdeWizard_MissingParameter" type="System.String" mimetype="System.String"> - <value>Parameter '{0}' is required. Check wizard definision file.</value> - <comment>A custom param in the .vsz file is missing. That is the first argument to the method.</comment> - </data> - <data name="Ide_ToolsMenu" type="System.String" mimetype="System.String"> - <value>Microsoft Reference Architecture</value> - <comment>Caption of the main menu item in Tools.</comment> - </data> - <data name="Ide_ToolsMenuTooltip" type="System.String" mimetype="System.String"> - <value>Provides access to the Reference Architecture wizards and design tools.</value> - </data> - <data name="Ide_CantInitializeMainTool" type="System.String" mimetype="System.String"> - <value>Main tool menu can't be initialized.</value> - <comment>An error happened while adding the tool menu.</comment> - </data> <data name="Gral_ServiceUnavailable" type="System.String" mimetype="System.String"> <value>Can't perform operation because service '{0}' is not setup properly. Ensure the Microsoft IPE Wizards add-in is loaded.</value> <comment>Receives the service that is unavailable.</comment> </data> - <data name="XsdFileEditor_Filter" type="System.String" mimetype="System.String"> - <value>XML Schema Files (*.xsd)|*.xsd</value> - <comment>Filter for the open dialog.</comment> - </data> - <data name="XsdFileEditor_Title" type="System.String" mimetype="System.String"> - <value>Select XML Schema File</value> - <comment>Title of the dialog.</comment> - </data> - <data name="Gral_ConfigurationFileNotSet" type="System.String" mimetype="System.String"> - <value>Main configuration file must be selected. Use the context menu option to select it.</value> - <comment>Config file is required for the current operation.</comment> - </data> - <data name="Gral_DeployScriptNotSet" type="System.String" mimetype="System.String"> - <value>Main deploy script file must be selected. Use the context menu option to select it.</value> - <comment>Deploy script file is required for the current operation.</comment> - </data> - <data name="XmlNodeListFactory_IHasXmlNodeMissing" type="System.String" mimetype="System.String"> - <value>The XPath query was not executed against an XmlNode-based object (such as XmlDocument).</value> - <comment>The factory received an XPathNodeIterator that was not obtained from querying an XmlDocument or XmlNode.</comment> - </data> - <data name="ValueEditor_Error" type="System.String" mimetype="System.String"> - <value>An error occurred while editing the value.</value> - <comment>Generic error handling.</comment> - </data> - <data name="CommandService_StackEmpty" type="System.String" mimetype="System.String"> - <value>List of commands is empty. Can't perform Undo operation.</value> - <comment>Someone called Undo without executing commands first.</comment> - </data> - <data name="CommandService_ExecuteError" type="System.String" mimetype="System.String"> - <value>Command failed: {0}. -Error: {1}</value> - <comment>{0}=command name/description, {1}=exception.</comment> - </data> - <data name="CommandService_UndoError" type="System.String" mimetype="System.String"> - <value>Couldn't undo command '{0}'. Error was: -{1}.</value> - <comment>{0}=command name/description, {1}=exception.</comment> - </data> - <data name="CommandService_ConfirmCaption" type="System.String" mimetype="System.String"> - <value>Confirm '{0}' execution</value> - <comment>{0}=command description. Title for the dialog</comment> - </data> - <data name="ExpressionEvaluator_EmptyArgumentReference" type="System.String" mimetype="System.String"> - <value>Argument reference can't be empty. It must be in the form '$(Argument)'. Value was '{0}'.</value> - <comment>An expression contained an empty argument reference. {0} is the full invalid expression.</comment> - </data> - <data name="ExpressionEvaluator_OpenArgumentReference" type="System.String" mimetype="System.String"> - <value>Argument reference not properly closed: '{0}'. Argument reference can't be empty. It must be in the form '$(Argument)'. Full value was '{1}'. </value> - <comment>An argument reference is missing the right parenthesis. {0} is the invalid open section, {1} is the full expression. </comment> - </data> - <data name="CommandService_InvalidRestoreState" type="System.String" mimetype="System.String"> - <value>Restore point state is invalid. Can't restore service state.</value> - <comment>Only the private class generated by the service can be used to restore its state.</comment> - </data> - <data name="Step_ConfirmReExecution" type="System.String" mimetype="System.String"> - <value>Some commands have already been executed. Do you want to undo them before executing with current arguments?</value> - <comment></comment> - </data> - <data name="Command_ArgumentRequired" type="System.String" mimetype="System.String"> - <value>Argument '{0}' is required for the execution of command '{1}'.</value> - <comment>{0}=missing argument. {1}=command type.</comment> - </data> - <data name="Command_UnsupportedArgumentType" type="System.String" mimetype="System.String"> - <value>Argument '{0}' has a type '{1}' which is not supported by command '{2}'. It must be one of: -{3}.</value> - <comment>{0}=argument name. {1}=argument type. {2}=command name, and {3}=concat list of valid types.</comment> - </data> - <data name="Step_ExecutionFailed" type="System.String" mimetype="System.String"> - <value>Execution failed for some commands.</value> - <comment>Some command didn't execute sucessfully.</comment> - </data> <data name="Dte_ProjectDoesntExist" type="System.String" mimetype="System.String"> <value>Project '{0}' doesn't exist in current solution.</value> <comment>{0}=project that doesn't exist in solution.</comment> @@ -237,63 +83,14 @@ <value>Parent item at location '{0}' doesn't exist.</value> <comment>{0}=path for the non-existent item.</comment> </data> - <data name="AddProject_InvalidKind" type="System.String" mimetype="System.String"> - <value>Project kind must be either "C#" or "VB". Received invalid '{0}' value.</value> - <comment>{0}=invalid project kind.</comment> - </data> <data name="Dte_TargetProjectExists" type="System.String" mimetype="System.String"> <value>Target project file '{0}' already exists.</value> <comment>{0}=target file name.</comment> </data> - <data name="AddProject_CantDeleteFolder" type="System.String" mimetype="System.String"> - <value>Folder '{0}' couldn't be deleted. Please remove it manually. Error was: -'{1}'.</value> - <comment>{0}=folder to remove, {1}=error message.</comment> - </data> - <data name="HandlersConverter_InvalidHandlers" type="System.String" mimetype="System.String"> - <value>The following handlers don't exist in the configuration file: -{0}</value> - <comment>{0}=join of invalid handlers</comment> - </data> - <data name="AddProject_CantAddProject" type="System.String" mimetype="System.String"> - <value>Project '{0}' couldn't be added. Retry with another name or check whether the target folder is empty.</value> - <comment>{0}= project failing to be added.</comment> - </data> - <data name="AddProject_InvalidPath" type="System.String" mimetype="System.String"> - <value>Can't find path '{0}' in current solution.</value> - <comment>{0}=invalid path</comment> - </data> <data name="Gral_ComponentNotSited" type="System.String" mimetype="System.String"> <value>The component hasn't been propertly initialized yet.</value> <comment>An operation requires the component to be sited and it hasn't been yet.</comment> </data> - <data name="Deployer_InvalidResource" type="System.String" mimetype="System.String"> - <value>Resource '{0}' wasn't found in current assembly. </value> - <comment>Resource to deploy doesn't exist. {0}=resource name</comment> - </data> - <data name="SolutionClassBrowserEditor_MSAB" type="System.String" mimetype="System.String"> - <value>Microsoft.ApplicationBlocks</value> - <comment>Checked to skip MS projects from the list.</comment> - </data> - <data name="SolutionClassBrowserEditor_SDAF" type="System.String" mimetype="System.String"> - <value>Microsoft.ReferenceArchitecture</value> - <comment>Checked to skip MS projects from the list.</comment> - </data> - <data name="WizardController_ConfirmExecution" type="System.String" mimetype="System.String"> - <value>Confirm wizard execution</value> - <comment>Title of the prompt for executing the wizard, if any.</comment> - </data> - <data name="AddProject_CantRemoveProject" type="System.String" mimetype="System.String"> - <value>Project '{0}' couldn't be removed. You will have to do so manually.</value> - <comment>For some reason removing the project didn't work. {0}=project name.</comment> - </data> - <data name="AddProject_ProjectAlreadyExists" type="System.String" mimetype="System.String"> - <value>Project '{0}' already exists in the solution.</value> - <comment>The project name selected is already present in the solution. {0}=project name.</comment> - </data> - <data name="Step_NoTipProvided" type="System.String" mimetype="System.String"> - <value>No tips available.</value> - </data> <data name="XmlValidate_GeneralError" type="System.String" mimetype="System.String"> <value>#error Couldn't process XML file! {0}</value> @@ -310,79 +107,10 @@ {0}</value> <comment>{0}=errors.</comment> </data> - <data name="Configuration_InvalidWizardConfig" type="System.String" mimetype="System.String"> - <value>Wizard configuration is invalid. Errors: -{0}</value> - <comment>{0}=errors.</comment> - </data> - <data name="AddOrSelectFolder_PathIsNotFolder" type="System.String" mimetype="System.String"> - <value>An item already exists with path '{0}' and it's not a folder.</value> - <comment>Tried to select a non-folder with a path. Receives the failing path.</comment> - </data> <data name="Dte_NoActiveProject" type="System.String" mimetype="System.String"> <value>A project must be selected before using this component.</value> <comment>No active project was found.</comment> </data> - <data name="DependencyEvaluator_InvalidExpression" type="System.String" mimetype="System.String"> - <value>Dependency expression '{0}' is invalid.</value> - <comment>Invalid expression received as argument 0.</comment> - </data> - <data name="DependencyEvaluator_DuplicateOperator" type="System.String" mimetype="System.String"> - <value>Duplicate operator '{0}' found in expression '{1}'.</value> - <comment>{0}=duplicate match, {1}=full expression.</comment> - </data> - <data name="DependencyEvaluator_OperatorMissing" type="System.String" mimetype="System.String"> - <value>Either 'and' or 'or' operators must precede argument name '{0}'. Expression was '{1}'.</value> - <comment>{0}=argument matched without operator. {1}=full expression.</comment> - </data> - <data name="CommandService_CommandCanceled" type="System.String" mimetype="System.String"> - <value>Command canceled by user.</value> - <comment>The user didn't accept the command execution.</comment> - </data> - <data name="AddOrSelectProject_PathRequiredForNew" type="System.String" mimetype="System.String"> - <value>A target folder for the new project must be selected, or an existing one must be selected to be used as a sibling.</value> - <comment>A new project has to be created, but the folder wasn't selected.</comment> - </data> - <data name="DependencyEvaluator_ValueNotComparable" type="System.String" mimetype="System.String"> - <value>Argument is of type {0} which can't be used for comparisons. (does not implement IComparable)</value> - <comment>An argument is used for a comparison but its value does not implement IComparable.</comment> - </data> - <data name="DependencyEvaluator_UnsupportedComparison" type="System.String" mimetype="System.String"> - <value>Comparison operator '{0}' is not supported.</value> - <comment>{0}=the operator.</comment> - </data> - <data name="WizardController_NonExistingAlias" type="System.String" mimetype="System.String"> - <value>There's no type definition with name '{0}' in the current wizard configuration.</value> - <comment>{0}=the type alias that wasn't found. We know it's an alias as it doesn't contain a colon separating the assembly name for a FQTN.</comment> - </data> - <data name="ExecuteTransformation_AssemblyNotSpecified" type="System.String" mimetype="System.String"> - <value>The template argument '{0}' can't be located as a file, and Assembly argument was not specified to load it from an embedded resource.</value> - <comment>The template argument '{0}' can't be located as a file, and Assembly argument was not specified to load it from an embedded resource.</comment> - </data> - <data name="ExecuteTransformation_AssemblyNotFound" type="System.String" mimetype="System.String"> - <value>Assembly '{0}' not found.</value> - <comment>{0}=assembly name that couldn't be loaded.</comment> - </data> - <data name="ExecuteTransformation_EmbeddedTemplateNotFound" type="System.String" mimetype="System.String"> - <value>Embedded resource with name '{0}' containing transformation template was not found in assembly '{1}'.</value> - <comment>{0}=resource name not found, and {1}=assembly name where we probed.</comment> - </data> - <data name="ExecuteTransformation_EmbeddedConfigNotFound" type="System.String" mimetype="System.String"> - <value>Embedded resource with name '{0}' containing configuration for the transformation engine was not found in assembly '{1}'.</value> - <comment>{0}=resource name not found, and {1}=assembly name where we probed.</comment> - </data> - <data name="ExecuteTransformation_TemplateFileNotFound" type="System.String" mimetype="System.String"> - <value>Can't load template file.</value> - <comment>FileNotFoundException</comment> - </data> - <data name="ExecuteTransformation_ConfigFileNotFound" type="System.String" mimetype="System.String"> - <value>Can't load configuration file.</value> - <comment>FileNotFoundException</comment> - </data> - <data name="ExpressionEvaluator_ArgumentMissing" type="System.String" mimetype="System.String"> - <value>Argument '{0}' is missing in the current context.</value> - <comment>An expression uses an argument that hasn't been specified.</comment> - </data> <data name="DteHelper_PathNotRelativeToSln" type="System.String" mimetype="System.String"> <value>File '{0}' is not relative to the solution file '{1}'.</value> <comment>{0}=file that is not relative to {1}, which is the solution filename.</comment> @@ -399,15 +127,11 @@ <value>VB</value> <comment>The Visual Basic language.</comment> </data> - <data name="OutputWindowService_InitializedMsg" type="System.String" mimetype="System.String"> - <value>Microsoft IPE Wizard Framework Output Window Service loaded.</value> - <comment>Output window was created.</comment> - </data> <data name="XGenTool_NoClassFound" type="System.String" mimetype="System.String"> <value>#error The selected element doesn't contain any class definitions.</value> <comment>#error The selected element doesn't contain any class definitions.</comment> </data> - <data name="XGenTool_GeneralError" type="System.String" mimetype="System.String"> + <data name="CustomTool_GeneralError" type="System.String" mimetype="System.String"> <value>#error Couldn't generate code. /* {0} Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/AssemblyInfo.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AssemblyInfo.cs 10 Oct 2004 15:26:43 -0000 1.1 +++ AssemblyInfo.cs 18 Dec 2004 05:11:45 -0000 1.2 @@ -9,14 +9,27 @@ [assembly: AssemblyTitle("Mvp.Xml.Design")] [assembly: AssemblyDescription("MVP XML Design Tools")] -[assembly: AssemblyVersion("0.1.*")] +[assembly: AssemblyVersion(ThisAssembly.Version)] [assembly: AssemblyDelaySign(false)] [assembly: AssemblyKeyFile("")] [assembly: AssemblyKeyName("")] +#if DEBUG +[assembly: AssemblyConfiguration("DEBUG")] +#else +[assembly: AssemblyConfiguration("RELEASE")] +#endif + #region Security Permissions //[assembly: SecurityPermission(SecurityAction.RequestRefuse, UnmanagedCode=true)] #endregion Security Permissions + +internal class ThisAssembly +{ + public const string Title = "Mvp.Xml.Design"; + public const string Description = "MVP XML Design Tools"; + public const string Version = "0.1.*"; +} \ No newline at end of file |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:11:54
|
Update of /cvsroot/mvp-xml/Design/v1/src/CustomTools/XGen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6940/v1/src/CustomTools/XGen Modified Files: XGenTool.cs Log Message: Index: XGenTool.cs =================================================================== RCS file: /cvsroot/mvp-xml/Design/v1/src/CustomTools/XGen/XGenTool.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XGenTool.cs 21 Oct 2004 20:42:06 -0000 1.1 +++ XGenTool.cs 18 Dec 2004 05:11:45 -0000 1.2 @@ -26,8 +26,8 @@ /// This tool supports C# projects only, as that's the code generated /// by the XmlSerializer class. /// </remarks> - [Guid("983A6445-3277-4cd1-97DF-5AA11A537921")] - [CustomTool("Mvp.Xml.XGen", "MVP XML XmlSerializer Generation Tool", false)] + [Guid("B8F154A6-E234-4c6f-9AD4-675713F4AABD")] + [CustomTool("Mvp.Xml.XGen", "MVP XML XmlSerializer Generation Tool", true)] [ComVisible(true)] [VersionSupport("7.1")] [CategorySupport(CategorySupportAttribute.CSharpCategory)] @@ -137,7 +137,7 @@ } catch (Exception e) { - return System.Text.Encoding.ASCII.GetBytes(SR.XGenTool_GeneralError(e)); + return System.Text.Encoding.ASCII.GetBytes(SR.CustomTool_GeneralError(e)); } finally { |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:11:47
|
Update of /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6921/v1/test/XPathNavigatorReaderTests Modified Files: Tests.cs Log Message: Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests/Tests.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Tests.cs 17 Nov 2004 15:18:10 -0000 1.3 +++ Tests.cs 18 Dec 2004 05:11:38 -0000 1.4 @@ -52,6 +52,22 @@ } [Test] + public void OlegEvilTest() + { + string xml = @"<foo><?pi text?></foo>"; + XPathDocument doc = new XPathDocument(new StringReader(xml)); + XPathNodeIterator ni = + doc.CreateNavigator().Select("//processing-instruction()"); + Assert.IsTrue(ni.MoveNext()); + XPathNavigatorReader r = new XPathNavigatorReader(ni.Current); + Assert.IsTrue(r.Read()); + Console.WriteLine("NodeType: {0}, Name: {1}, Value: {2}", + r.NodeType, r.Name, r.Value); + Assert.AreEqual(XmlNodeType.ProcessingInstruction, r.NodeType); + Assert.IsFalse(r.Read()); + } + + [Test] public void TestEmptyRoot() { string xml = "<root/>"; |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:08:12
|
Update of /cvsroot/mvp-xml/Common/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6295/v1/src Modified Files: XmlBaseAwareXmlTextReader.cs Log Message: Fixed NullRefException Index: XmlBaseAwareXmlTextReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XmlBaseAwareXmlTextReader.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- XmlBaseAwareXmlTextReader.cs 24 Nov 2004 16:23:40 -0000 1.3 +++ XmlBaseAwareXmlTextReader.cs 18 Dec 2004 05:08:02 -0000 1.4 @@ -149,7 +149,7 @@ } else if (base.NodeType == XmlNodeType.EndElement) { - if (base.Depth == _state.Depth && _states.Count > 0) + if (base.Depth == _state.Depth && _states != null && _states.Count > 0) { //Pop previous state _state = (XmlBaseState)_states.Pop(); |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 05:00:50
|
Update of /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4865/v1/test/XmlBaseAwareXmlTextReaderTests Modified Files: Tests.cs Log Message: Added additional test. Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests/Tests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Tests.cs 24 Nov 2004 16:23:40 -0000 1.2 +++ Tests.cs 18 Dec 2004 05:00:39 -0000 1.3 @@ -62,5 +62,22 @@ } r.Close(); } + + [Test] + public void ReaderWithPath() + { + XmlTextReader r = new XmlBaseAwareXmlTextReader(@"..\..\XmlBaseAwareXmlTextReaderTests\test.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")); + ni = nav.Select("/catalog/relative/relativenode"); + ni.MoveNext(); + Console.WriteLine(ni.Current.BaseURI); + Assert.IsTrue(ni.Current.BaseURI.IndexOf("/XmlBaseAwareXmlTextReaderTests/") != -1); + } + } } |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 04:58:25
|
Update of /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4377/v1/test/XmlBaseAwareXmlTextReaderTests Modified Files: test.xml Log Message: New test for xml base. Index: test.xml =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests/test.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- test.xml 24 Nov 2004 16:23:45 -0000 1.2 +++ test.xml 18 Dec 2004 04:58:13 -0000 1.3 @@ -13,4 +13,7 @@ <!-- comment --> </b> </a> + <relative xml:base="subfolder/second.xml"> + <relativenode /> + </relative> </catalog> |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-12-18 04:47:32
|
Update of /cvsroot/mvp-xml/Common/v1/src/XPath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1981/v1/src/XPath Modified Files: XPathNavigatorReader.cs Log Message: Fixed bug for PIs. Index: XPathNavigatorReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XPath/XPathNavigatorReader.cs,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- XPathNavigatorReader.cs 17 Nov 2004 15:18:10 -0000 1.5 +++ XPathNavigatorReader.cs 18 Dec 2004 04:47:22 -0000 1.6 @@ -674,12 +674,22 @@ } else { - // Otherwise, move to the parent and set as the - // end element of it (we already read all children therefore). - _navigator.MoveToParent(); - _depth--; - _isendelement = true; - return true; + if (_depth == 0) + { + // We reached the end of the fragment/content. + _eof = true; + _state = ReadState.EndOfFile; + return false; + } + else + { + // Otherwise, move to the parent and set as the + // end element of it (we already read all children therefore). + _navigator.MoveToParent(); + _depth--; + _isendelement = true; + return true; + } } } } |
|
From: Oleg T. <he...@us...> - 2004-11-24 16:24:35
|
Update of /cvsroot/mvp-xml/Common/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18418/v1/src Modified Files: XmlBaseAwareXmlTextReader.cs Log Message: Fixed XmlBase impl... Thanks to kzu for reporting it! Index: XmlBaseAwareXmlTextReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XmlBaseAwareXmlTextReader.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- XmlBaseAwareXmlTextReader.cs 7 Nov 2004 16:41:17 -0000 1.2 +++ XmlBaseAwareXmlTextReader.cs 24 Nov 2004 16:23:40 -0000 1.3 @@ -3,6 +3,7 @@ using System; using System.Xml; using System.IO; +using System.Collections; #endregion @@ -15,7 +16,8 @@ { #region private - private Uri _baseUri = null; + private XmlBaseState _state = new XmlBaseState(); + private Stack _states = null; #endregion @@ -27,7 +29,7 @@ public XmlBaseAwareXmlTextReader(string uri) : base(uri) { - _baseUri = new Uri(base.BaseURI); + _state.BaseUri = new Uri(base.BaseURI); } /// <summary> @@ -37,7 +39,7 @@ public XmlBaseAwareXmlTextReader(string uri, XmlNameTable nt) : base(uri, nt) { - _baseUri = new Uri(base.BaseURI); + _state.BaseUri = new Uri(base.BaseURI); } /// <summary> @@ -53,7 +55,7 @@ public XmlBaseAwareXmlTextReader(string uri, TextReader reader) : base(uri, reader) { - _baseUri = new Uri(base.BaseURI); + _state.BaseUri = new Uri(base.BaseURI); } /// <summary> @@ -70,7 +72,7 @@ public XmlBaseAwareXmlTextReader(string uri, TextReader reader, XmlNameTable nt) : base(uri, reader, nt) { - _baseUri = new Uri(base.BaseURI); + _state.BaseUri = new Uri(base.BaseURI); } /// <summary> @@ -85,7 +87,7 @@ public XmlBaseAwareXmlTextReader(string uri, Stream stream) : base(uri, stream) { - _baseUri = new Uri(base.BaseURI); + _state.BaseUri = new Uri(base.BaseURI); } /// <summary> @@ -102,7 +104,7 @@ public XmlBaseAwareXmlTextReader(string uri, Stream stream, XmlNameTable nt) : base(uri, stream, nt) { - _baseUri = new Uri(base.BaseURI); + _state.BaseUri = new Uri(base.BaseURI); } #endregion @@ -116,7 +118,7 @@ { get { - return _baseUri==null? "" : _baseUri.AbsoluteUri; + return _state.BaseUri==null? "" : _state.BaseUri.AbsoluteUri; } } @@ -126,22 +128,51 @@ public override bool Read() { bool baseRead = base.Read(); - if (baseRead && - base.NodeType == XmlNodeType.Element && - base.HasAttributes) + if (baseRead) { - string baseAttr = GetAttribute("xml:base"); - if (baseAttr == null) - return baseRead; - if (_baseUri == null) - _baseUri = new Uri(baseAttr); - else - _baseUri = new Uri(_baseUri, baseAttr); + if (base.NodeType == XmlNodeType.Element && + base.HasAttributes) + { + string baseAttr = GetAttribute("xml:base"); + if (baseAttr == null) + return baseRead; + Uri newBaseUri = null; + if (_state.BaseUri == null) + newBaseUri = new Uri(baseAttr); + else + newBaseUri = new Uri(_state.BaseUri, baseAttr); + if (_states == null) + _states = new Stack(); + //Push current state and allocate new one + _states.Push(_state); + _state = new XmlBaseState(newBaseUri, base.Depth); + } + else if (base.NodeType == XmlNodeType.EndElement) + { + if (base.Depth == _state.Depth && _states.Count > 0) + { + //Pop previous state + _state = (XmlBaseState)_states.Pop(); + } + } } return baseRead; - } #endregion } + + internal class XmlBaseState + { + public XmlBaseState() {} + + public XmlBaseState(Uri baseUri, int depth) + { + this.BaseUri = baseUri; + this.Depth = depth; + } + + public Uri BaseUri; + public int Depth; + } } |
|
From: Oleg T. <he...@us...> - 2004-11-24 16:24:01
|
Update of /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18418/v1/test/XmlBaseAwareXmlTextReaderTests Modified Files: Tests.cs test.xml Log Message: Fixed XmlBase impl... Thanks to kzu for reporting it! Index: test.xml =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests/test.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- test.xml 25 Oct 2004 18:18:06 -0000 1.1 +++ test.xml 24 Nov 2004 16:23:45 -0000 1.2 @@ -2,5 +2,15 @@ <catalog> <files xml:base="file:///d:/Files/"> <file name="file1.xml"/> + <?pi ?> </files> + <a> + <b xml:base="file:///d:/Files/a/"> + <c xml:base="file:///d:/Files/c/"> + <e>text</e> + </c> + <d></d> + <!-- comment --> + </b> + </a> </catalog> Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XmlBaseAwareXmlTextReaderTests/Tests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Tests.cs 25 Oct 2004 18:18:06 -0000 1.1 +++ Tests.cs 24 Nov 2004 16:23:40 -0000 1.2 @@ -15,14 +15,52 @@ XmlTextReader r = new XmlBaseAwareXmlTextReader( Globals.GetResource( this.GetType().Namespace + ".test.xml")); - XPathDocument doc = new XPathDocument(r); - XPathNavigator nav = doc.CreateNavigator(); - XPathNodeIterator ni = nav.Select("/catalog"); - ni.MoveNext(); - Assert.IsTrue(ni.Current.BaseURI == ""); - ni = nav.Select("/catalog/files/file"); - ni.MoveNext(); - Assert.IsTrue(ni.Current.BaseURI == "file:///d:/Files/"); + while (r.Read()) + { + if (r.NodeType == XmlNodeType.Element) + { + switch (r.Name) + { + case "catalog": + Assert.IsTrue(r.BaseURI == ""); + break; + case "files": + Assert.IsTrue(r.BaseURI == "file:///d:/Files/"); + break; + case "file": + Assert.IsTrue(r.BaseURI == "file:///d:/Files/"); + break; + case "a": + Assert.IsTrue(r.BaseURI == ""); + break; + case "b": + Assert.IsTrue(r.BaseURI == "file:///d:/Files/a/"); + break; + case "c": + Assert.IsTrue(r.BaseURI == "file:///d:/Files/c/"); + break; + case "e": + Assert.IsTrue(r.BaseURI == "file:///d:/Files/c/"); + break; + case "d": + Assert.IsTrue(r.BaseURI == "file:///d:/Files/a/"); + break; + } + } + else if (r.NodeType == XmlNodeType.Text && r.Value.Trim() != "") + { + Assert.IsTrue(r.BaseURI == "file:///d:/Files/c/"); + } + else if (r.NodeType == XmlNodeType.Comment) + { + Assert.IsTrue(r.BaseURI == "file:///d:/Files/a/"); + } + else if (r.NodeType == XmlNodeType.ProcessingInstruction) + { + Assert.IsTrue(r.BaseURI == "file:///d:/Files/"); + } + } + r.Close(); } } } |
|
From: Oleg T. <he...@us...> - 2004-11-22 14:03:58
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14444/v1/test Modified Files: EntryPoint.cs NistTests.cs XIncludeReaderTests.cs Log Message: Fixing bugs... Index: EntryPoint.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/EntryPoint.cs,v retrieving revision 1.16 retrieving revision 1.17 diff -u -d -r1.16 -r1.17 --- EntryPoint.cs 7 Nov 2004 14:49:57 -0000 1.16 +++ EntryPoint.cs 22 Nov 2004 14:03:48 -0000 1.17 @@ -9,15 +9,15 @@ { public static void Main() { - XIncludeReaderTests rt = new XIncludeReaderTests(); + //XIncludeReaderTests rt = new XIncludeReaderTests(); //LTG_Edinburgh_UnivTests rt = new LTG_Edinburgh_UnivTests(); - //NISTTests rt = new NISTTests(); + NISTTests rt = new NISTTests(); //Elliotte_Rusty_HaroldTests rt = new Elliotte_Rusty_HaroldTests(); //FourThoughtTests rt = new FourThoughtTests(); //XIncludeSyntaxTests rt = new XIncludeSyntaxTests(); try { - rt.CachingTest(); + rt.Nist_include_49(); } catch (Exception e) { Index: XIncludeReaderTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XIncludeReaderTests.cs,v retrieving revision 1.17 retrieving revision 1.18 diff -u -d -r1.17 -r1.18 --- XIncludeReaderTests.cs 7 Nov 2004 14:49:57 -0000 1.17 +++ XIncludeReaderTests.cs 22 Nov 2004 14:03:48 -0000 1.18 @@ -139,7 +139,7 @@ break; case XmlNodeType.Text: Assert.IsTrue(r2.NodeType == XmlNodeType.CDATA || r2.NodeType == XmlNodeType.Text); - Assert.AreEqual(r1.Value.Replace("\r\n", "\n").Trim(), r2.Value.Replace("\r\n", "\n").Trim()); + Assert.AreEqual(r1.Value.Replace("\r\n", "\n").Replace("\r", "").Trim(), r2.Value.Replace("\r\n", "\n").Replace("\r", "").Trim()); break; default: break; Index: NistTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NistTests.cs,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- NistTests.cs 14 Nov 2004 20:44:14 -0000 1.8 +++ NistTests.cs 22 Nov 2004 14:03:48 -0000 1.9 @@ -312,7 +312,7 @@ [ExpectedException(typeof(MalformedXInclusionResultError))] public void Nist_include_24() { - RunAndCompare("nist-include-24.xml", ""); + RunAndCompare("nist-include-24.xml", "nist-include-21.xml"); } @@ -325,7 +325,7 @@ [ExpectedException(typeof(MalformedXInclusionResultError))] public void Nist_include_25() { - RunAndCompare("nist-include-25.xml", ""); + RunAndCompare("nist-include-25.xml", "nist-include-21.xml"); } @@ -597,8 +597,9 @@ /// It is a fatal error to resolve an xpointer scheme on a document /// that contains unexpanded entity reference information items. /// </summary> + /// <remarks>No support for unexpanded entity references here.</remarks> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(DirectoryNotFoundException))] public void Nist_include_48() { RunAndCompare("nist-include-48.xml", ""); @@ -687,6 +688,7 @@ /// Including a duplicate unparsed entity. /// Test should ignore duplicate unparsed entity. /// </summary> + /// <remarks>No support for unparsed entities here.</remarks> [Test] public void Nist_include_55() { @@ -699,8 +701,9 @@ /// Including an unparsed entity with same name, /// but different sysid. Test should fail. /// </summary> + /// <remarks>No support for unparsed entities here.</remarks> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(DirectoryNotFoundException))] public void Nist_include_56() { RunAndCompare("nist-include-56.xml", ""); |
|
From: Oleg T. <he...@us...> - 2004-11-22 14:03:57
|
Update of /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/test/docs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14444/v1/test/XInclude-Test-Suite/Nist/test/docs Modified Files: nist-include-49.xml Log Message: Fixing bugs... Index: nist-include-49.xml =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/XInclude-Test-Suite/Nist/test/docs/nist-include-49.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nist-include-49.xml 29 Sep 2004 07:46:16 -0000 1.1 +++ nist-include-49.xml 22 Nov 2004 14:03:48 -0000 1.2 @@ -1,3 +1,6 @@ +<!DOCTYPE x [ +<!ENTITY e SYSTEM "../ents/004.ent"> +]> <x xmlns:xinclude="http://www.w3.org/2001/XInclude"> <!-- Including another XML document that contains an unexpanded entity reference. --> <xinclude:include href="../ents/extref.xml" parse="xml"/> |
|
From: Oleg T. <he...@us...> - 2004-11-22 14:03:56
|
Update of /cvsroot/mvp-xml/XInclude/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14444/v1/src Modified Files: XIncludingReader.cs Log Message: Fixing bugs... Index: XIncludingReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XIncludingReader.cs,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- XIncludingReader.cs 7 Nov 2004 16:46:25 -0000 1.29 +++ XIncludingReader.cs 22 Nov 2004 14:03:47 -0000 1.30 @@ -1387,9 +1387,9 @@ { //Include document as XML Uri includeLocation = ResolveHref(href); - CheckLoops(includeLocation, xpointer); if (includeLocation.Fragment != String.Empty) throw new XIncludeSyntaxError(SR.FragmentIDInHref); + CheckLoops(includeLocation, xpointer); if (_xmlResolver == null) { //No custom resolver |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-17 15:18:20
|
Update of /cvsroot/mvp-xml/Common/v1/src/XPath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5194/v1/src/XPath Modified Files: XPathNavigatorReader.cs Log Message: Fixed bug that didn't allow reading comments and PIs even if they are allows under the root (not considered as fragments) Index: XPathNavigatorReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XPath/XPathNavigatorReader.cs,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- XPathNavigatorReader.cs 14 Nov 2004 01:24:29 -0000 1.4 +++ XPathNavigatorReader.cs 17 Nov 2004 15:18:10 -0000 1.5 @@ -129,6 +129,19 @@ } } ArrayList _orderedattributes; + /// <summary> + /// Whether the reader should continue even if the current element has ended or is empty. + /// </summary> + private bool AllowFragment + { + get + { + return _fragment || + _navigator.NodeType == XPathNodeType.ProcessingInstruction || + _navigator.NodeType == XPathNodeType.Comment; + } + } + #endregion Private Members #region ReadFragmentXml @@ -574,7 +587,7 @@ if (_isendelement) { - if (_fragment) + if (AllowFragment) { // If XML fragment is allowed, we'll let movements // outside the original location, but only to sibling nodes. @@ -620,20 +633,29 @@ return _navigator.MoveToFirstChild(); } - // 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 (_navigator.IsSamePosition(_original) && !_fragment && !_navigator.HasChildren) - { - _eof = true; - _state = ReadState.EndOfFile; - return false; - } - // If XML fragment is not allowed and we're already at the - // original location, set as end element. - if (_navigator.IsSamePosition(_original) && !_fragment) + if (_navigator.IsSamePosition(_original)) { - _isendelement = true; - return true; + // 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) + { + _eof = true; + _state = ReadState.EndOfFile; + return false; + } + else if (!AllowFragment) + { + // If XML fragment is not allowed and we're already at the + // original location, set as end element. + _isendelement = true; + return true; + } + else + { + // Reposition original pointer. + // If this is false, the following code will check ending conditions. + _original.MoveToNext(); + } } // Otherwise, try to move to sibling. if (_navigator.MoveToNext()) |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-17 15:18:20
|
Update of /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5194/v1/test/XPathNavigatorReaderTests Modified Files: Tests.cs Log Message: Fixed bug that didn't allow reading comments and PIs even if they are allows under the root (not considered as fragments) Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests/Tests.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Tests.cs 14 Nov 2004 01:24:30 -0000 1.2 +++ Tests.cs 17 Nov 2004 15:18:10 -0000 1.3 @@ -22,6 +22,8 @@ { string xml = @"<?xml version='1.0'?> <!-- comment --> +<?an arbitrary PI ?> +<!-- another comment --> <foo />"; XmlReader tr = new XmlTextReader(new StringReader(xml)); @@ -39,6 +41,13 @@ reader = new XPathNavigatorReader(nav); Assert.IsTrue(reader.Read()); Assert.AreEqual(XmlNodeType.Comment, reader.NodeType); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(XmlNodeType.ProcessingInstruction, reader.NodeType); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(XmlNodeType.Comment, reader.NodeType); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(XmlNodeType.Element, reader.NodeType); + Assert.IsTrue(reader.IsEmptyElement); Assert.IsFalse(reader.Read()); } @@ -646,15 +655,19 @@ public void TestSiblingRead() { string xml = @"<foo><bar/><baz/></foo>"; + + XmlTextReader tr = new XmlTextReader(new StringReader(xml)); + tr.MoveToContent(); + Assert.AreEqual("foo", tr.LocalName); + XPathDocument doc = new XPathDocument(new StringReader(xml)); XPathNavigator nav = doc.CreateNavigator(); XPathNodeIterator ni = nav.Select("/foo/bar"); if (ni.MoveNext()) { XPathNavigatorReader r = new XPathNavigatorReader(ni.Current); - r.MoveToContent(); - Assert.AreEqual(r.LocalName, "bar"); Assert.IsTrue(r.Read()); + Assert.AreEqual("bar", r.LocalName); Assert.IsFalse(r.Read()); r.Close(); } |
|
From: Oleg T. <he...@us...> - 2004-11-14 20:44:25
|
Update of /cvsroot/mvp-xml/XInclude/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24886/v1/test Modified Files: NistTests.cs Log Message: Index: NistTests.cs =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/test/NistTests.cs,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- NistTests.cs 3 Nov 2004 12:55:46 -0000 1.7 +++ NistTests.cs 14 Nov 2004 20:44:14 -0000 1.8 @@ -309,7 +309,7 @@ /// Test should fail because is including only a processing instruction. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(MalformedXInclusionResultError))] public void Nist_include_24() { RunAndCompare("nist-include-24.xml", ""); @@ -322,7 +322,7 @@ /// Test should fail because is including only a comment. /// </summary> [Test] - [ExpectedException(typeof(Exception))] + [ExpectedException(typeof(MalformedXInclusionResultError))] public void Nist_include_25() { RunAndCompare("nist-include-25.xml", ""); |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-14 02:11:06
|
Update of /cvsroot/mvp-xml/Common/v1/test/XPathIteratorReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31103/v1/test/XPathIteratorReaderTests Modified Files: Tests.cs Log Message: Fixed test for XPathIteratorREader. Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XPathIteratorReaderTests/Tests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Tests.cs 27 Sep 2004 16:31:14 -0000 1.1 +++ Tests.cs 14 Nov 2004 02:10:44 -0000 1.2 @@ -80,7 +80,7 @@ reader.MoveToContent(); xml = reader.ReadOuterXml(); - Assert.AreEqual("<orders><order id=\"1\" xmlns=\"mvp-xml\" /><order id=\"2\" xmlns=\"mvp-xml\" /><order id=\"5\" xmlns=\"mvp-xml\" /></orders>", xml); + Assert.AreEqual("<orders><order id=\"1\" xmlns=\"mvp-xml\" /><order id=\"2\" xmlns=\"mvp-xml\" /></orders>", xml); } } } \ No newline at end of file |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-14 01:24:40
|
Update of /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22700/v1/test/XPathNavigatorReaderTests Modified Files: Tests.cs Log Message: Bug fix in XmlNodeListFactory. Thanks to Raneses, Jason. Bug fixes in XPathNavigatorReader (thanks Oleg!) Index: Tests.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/XPathNavigatorReaderTests/Tests.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Tests.cs 27 Sep 2004 16:31:14 -0000 1.1 +++ Tests.cs 14 Nov 2004 01:24:30 -0000 1.2 @@ -18,6 +18,45 @@ public class Tests { [Test] + public void TestComment() + { + string xml = @"<?xml version='1.0'?> +<!-- comment --> +<foo />"; + + XmlReader tr = new XmlTextReader(new StringReader(xml)); + XmlWriter tw = new XmlTextWriter(Console.Out); + //tw.WriteNode(tr, false); + //Console.WriteLine(); + + XPathDocument doc = new XPathDocument(new StringReader(xml)); + XPathNavigator nav = doc.CreateNavigator(); + + XPathNavigatorReader reader = new XPathNavigatorReader(nav); + //tw.WriteNode(reader, false); + tw.Close(); + + reader = new XPathNavigatorReader(nav); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(XmlNodeType.Comment, reader.NodeType); + Assert.IsFalse(reader.Read()); + } + + [Test] + public void TestEmptyRoot() + { + string xml = "<root/>"; + XPathDocument doc = new XPathDocument(new StringReader(xml)); + XPathNavigator nav = doc.CreateNavigator(); + + XPathNavigatorReader reader = new XPathNavigatorReader(nav); + Assert.IsTrue(reader.Read()); + Assert.AreEqual(XmlNodeType.Element, reader.NodeType); + Assert.IsTrue(reader.IsEmptyElement); + Assert.IsFalse(reader.Read()); + } + + [Test] public void FragmentValidation() { #region <publishers> framgment validation @@ -603,6 +642,24 @@ content); } + [Test] + public void TestSiblingRead() + { + string xml = @"<foo><bar/><baz/></foo>"; + XPathDocument doc = new XPathDocument(new StringReader(xml)); + XPathNavigator nav = doc.CreateNavigator(); + XPathNodeIterator ni = nav.Select("/foo/bar"); + if (ni.MoveNext()) + { + XPathNavigatorReader r = new XPathNavigatorReader(ni.Current); + r.MoveToContent(); + Assert.AreEqual(r.LocalName, "bar"); + Assert.IsTrue(r.Read()); + Assert.IsFalse(r.Read()); + r.Close(); + } + } + #region Debug members [Test] |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-14 01:24:39
|
Update of /cvsroot/mvp-xml/Common/v1/src/XPath In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22700/v1/src/XPath Modified Files: XPathNavigatorReader.cs Log Message: Bug fix in XmlNodeListFactory. Thanks to Raneses, Jason. Bug fixes in XPathNavigatorReader (thanks Oleg!) Index: XPathNavigatorReader.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XPath/XPathNavigatorReader.cs,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- XPathNavigatorReader.cs 28 Oct 2004 18:20:19 -0000 1.3 +++ XPathNavigatorReader.cs 14 Nov 2004 01:24:29 -0000 1.4 @@ -28,7 +28,7 @@ /// See: http://weblogs.asp.net/cazzu/archive/2004/04/19/115966.aspx and /// http://weblogs.asp.net/cazzu/archive/2004/05/10/129101.aspx. /// </remarks> - public class XPathNavigatorReader : XmlTextReader, IXmlSerializable, IHasXPathNavigator + public class XPathNavigatorReader : XmlTextReader, IXmlSerializable, IXPathNavigable { #region Fields @@ -621,13 +621,20 @@ } // 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 (_navigator.IsSamePosition(_original) && !_fragment && !_navigator.HasChildren) + { + _eof = true; + _state = ReadState.EndOfFile; + return false; + } + // If XML fragment is not allowed and we're already at the // original location, set as end element. if (_navigator.IsSamePosition(_original) && !_fragment) { _isendelement = true; return true; } - // Otherwise, try to move to sibling. if (_navigator.MoveToNext()) { @@ -736,16 +743,16 @@ #endregion - #region IHasXPathNavigator Members + #region IXPathNavigable Members - /// <summary> - /// Returns the XPathNavigator for the current position. - /// </summary> - public XPathNavigator GetNavigator() - { - return _navigator.Clone(); - } + /// <summary> + /// Returns the XPathNavigator for the current position. + /// </summary> + public XPathNavigator CreateNavigator() + { + return _navigator.Clone(); + } - #endregion - } + #endregion + } } |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-14 01:24:39
|
Update of /cvsroot/mvp-xml/Common/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22700/v1/src Modified Files: Common.csproj XmlNodeListFactory.cs changelog.txt Log Message: Bug fix in XmlNodeListFactory. Thanks to Raneses, Jason. Bug fixes in XPathNavigatorReader (thanks Oleg!) Index: XmlNodeListFactory.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/XmlNodeListFactory.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- XmlNodeListFactory.cs 27 Sep 2004 16:27:12 -0000 1.1 +++ XmlNodeListFactory.cs 14 Nov 2004 01:24:29 -0000 1.2 @@ -76,7 +76,9 @@ { if (index >= _nodes.Count) ReadTo(index); - + // Compatible behavior with .NET + if (index >= _nodes.Count || index < 0) + return null; return (XmlNode) _nodes[index]; } } @@ -129,6 +131,14 @@ get { return _done; } } bool _done; + /// <summary> + /// Current count of nodes in the iterator (read so far). + /// </summary> + private int CurrentPosition + { + get { return _nodes.Count; } + } + #region XmlNodeListEnumerator private class XmlNodeListEnumerator: IEnumerator @@ -156,7 +166,7 @@ // If we reached the end and our index is still // bigger, there're no more items. - if (_iterator.Done && _position >= _position) + if (_iterator.Done && _position >= _iterator.CurrentPosition) return false; return true; Index: changelog.txt =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/changelog.txt,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- changelog.txt 27 Sep 2004 16:27:12 -0000 1.1 +++ changelog.txt 14 Nov 2004 01:24:29 -0000 1.2 @@ -1,3 +1,16 @@ +November 13, 2004 + +Bug fix in XmlNodeListFactory. Thanks to Raneses, Jason. +Bug fixes in XPathNavigatorReader (thanks Oleg!) + +--------------------------------------------------------- + +October 8, 2004 + +Bug fix in XPathCache that caused NullReferenceExceptions if an XmlNamespaceManager is not used when selecting nodes. + +--------------------------------------------------------- + June 30, 2004 Added XPathNavigatorIterator Index: Common.csproj =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/src/Common.csproj,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- Common.csproj 8 Nov 2004 15:18:58 -0000 1.5 +++ Common.csproj 14 Nov 2004 01:24:29 -0000 1.6 @@ -158,11 +158,6 @@ BuildAction = "Compile" /> <File - RelPath = "XPath\IHasXPathNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "XPath\IndexingXPathNavigator.cs" SubType = "Code" BuildAction = "Compile" |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-14 01:24:39
|
Update of /cvsroot/mvp-xml/Common/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22700/v1/test Modified Files: CommonTest.csproj Misc.cs Removed Files: CodeWriterTest.cs Log Message: Bug fix in XmlNodeListFactory. Thanks to Raneses, Jason. Bug fixes in XPathNavigatorReader (thanks Oleg!) Index: CommonTest.csproj =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/CommonTest.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- CommonTest.csproj 25 Oct 2004 18:18:06 -0000 1.2 +++ CommonTest.csproj 14 Nov 2004 01:24:30 -0000 1.3 @@ -179,6 +179,11 @@ BuildAction = "Compile" /> <File + RelPath = "XmlNodeListFactoryTests.cs" + SubType = "Code" + BuildAction = "Compile" + /> + <File RelPath = "XmlParsedWriterTests.cs" SubType = "Code" BuildAction = "Compile" Index: Misc.cs =================================================================== RCS file: /cvsroot/mvp-xml/Common/v1/test/Misc.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Misc.cs 27 Sep 2004 16:31:14 -0000 1.1 +++ Misc.cs 14 Nov 2004 01:24:30 -0000 1.2 @@ -1,4 +1,5 @@ using System; +using System.Collections; using System.Diagnostics; using System.IO; using System.Reflection; --- CodeWriterTest.cs DELETED --- |
|
From: Daniel C. \(kzu\) <dca...@us...> - 2004-11-14 01:23:48
|
Update of /cvsroot/mvp-xml/Common/v1/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22521/v1/test Added Files: XmlNodeListFactoryTests.cs Log Message: Added tests that were missing for the XmlNodeListFactory class --- NEW FILE: XmlNodeListFactoryTests.cs --- #region using using System; using System.Collections; using System.IO; using System.Xml; using System.Xml.Serialization; using System.Xml.XPath; using NUnit.Framework; using Mvp.Xml.Common; #endregion using namespace Mvp.Xml.Tests { /// <summary> /// </summary> [TestFixture] public class XmlNodeListFactoryTests { private XmlDocument pubsDocument; [SetUp] public void Setup() { pubsDocument = new XmlDocument(); pubsDocument.Load(Globals.GetResource(Globals.PubsResource)); } [Test] public void MultipleCompleteEnumerations() { XPathNodeIterator nodeIterator = pubsDocument.CreateNavigator().Select("/dsPubs/publishers"); XmlNodeList nodeList = XmlNodeListFactory.CreateNodeList(nodeIterator); // Get the first node list enumerator. IEnumerator enumerator = nodeList.GetEnumerator(); while (enumerator.MoveNext()) { // Enumerate all publishers. } // Get the second node list enumerator. enumerator = nodeList.GetEnumerator(); // Ensure that the second node list enumerator is in a usable state. Assert.IsTrue(enumerator.MoveNext()); } [Test] public void List1() { string xml = @"<?xml version='1.0'?> <root> <element>1</element> <element></element> <element/> <element>2</element> </root>"; XmlDocument doc = new XmlDocument(); doc.LoadXml(xml); XPathNodeIterator iterator = doc.CreateNavigator().Select("//element"); XmlNodeList list = XmlNodeListFactory.CreateNodeList(iterator); int count = 0; foreach (XmlNode n in list) { count++; } Assert.AreEqual(4, count); iterator = doc.CreateNavigator().Select("//element"); list = XmlNodeListFactory.CreateNodeList(iterator); Assert.AreEqual(4, list.Count); } } } |
|
From: Oleg T. <he...@us...> - 2004-11-13 20:14:35
|
Update of /cvsroot/mvp-xml/WebSite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20202 Modified Files: upload.cmd Log Message: Index: upload.cmd =================================================================== RCS file: /cvsroot/mvp-xml/WebSite/upload.cmd,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- upload.cmd 3 Nov 2004 12:59:55 -0000 1.3 +++ upload.cmd 13 Nov 2004 20:14:25 -0000 1.4 @@ -1,8 +1,4 @@ @echo off set USER=helgy rem You need to install PSCP from http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html and have it on your %path% -pscp index.html %USER%@shell.sourceforge.net:/home/groups/m/mv/mvp-xml/htdocs -pscp style.css %USER%@shell.sourceforge.net:/home/groups/m/mv/mvp-xml/htdocs -pscp common/index.html %USER%@shell.sourceforge.net:/home/groups/m/mv/mvp-xml/htdocs/common -pscp xinclude/index.html %USER%@shell.sourceforge.net:/home/groups/m/mv/mvp-xml/htdocs/xinclude -pscp xpointer/index.html %USER%@shell.sourceforge.net:/home/groups/m/mv/mvp-xml/htdocs/xpointer \ No newline at end of file +pscp -r *.* %USER%@shell.sourceforge.net:/home/groups/m/mv/mvp-xml/htdocs |
|
From: Oleg T. <he...@us...> - 2004-11-09 12:25:11
|
Update of /cvsroot/mvp-xml/XPointer/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22268/v1/src Modified Files: XPointer.csproj Log Message: Index: XPointer.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XPointer/v1/src/XPointer.csproj,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- XPointer.csproj 8 Nov 2004 15:20:21 -0000 1.8 +++ XPointer.csproj 9 Nov 2004 12:25:03 -0000 1.9 @@ -194,48 +194,18 @@ BuildAction = "EmbeddedResource" /> <File - RelPath = "Common\XmlFirstLowerWriter.cs" - Link = "..\..\..\Common\v1\src\XmlFirstLowerWriter.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XmlFirstUpperReader.cs" - Link = "..\..\..\Common\v1\src\XmlFirstUpperReader.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XmlFragmentStream.cs" - Link = "..\..\..\Common\v1\src\XmlFragmentStream.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XmlNamespaces.cs" Link = "..\..\..\Common\v1\src\XmlNamespaces.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XmlNodeFactory.cs" - Link = "..\..\..\Common\v1\src\XmlNodeFactory.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XmlNodeListFactory.cs" Link = "..\..\..\Common\v1\src\XmlNodeListFactory.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XmlParsedWriter.cs" - Link = "..\..\..\Common\v1\src\XmlParsedWriter.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XmlPrefix.cs" Link = "..\..\..\Common\v1\src\XmlPrefix.cs" SubType = "Code" @@ -254,42 +224,12 @@ BuildAction = "Compile" /> <File - RelPath = "Common\XPath\IndexingXPathNavigator.cs" - Link = "..\..\..\Common\v1\src\XPath\IndexingXPathNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XPath\SubtreeeXPathNavigator.cs" - Link = "..\..\..\Common\v1\src\XPath\SubtreeeXPathNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XPath\XmlNodeNavigator.cs" - Link = "..\..\..\Common\v1\src\XPath\XmlNodeNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XPath\XPathCache.cs" Link = "..\..\..\Common\v1\src\XPath\XPathCache.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XPath\XPathIteratorReader.cs" - Link = "..\..\..\Common\v1\src\XPath\XPathIteratorReader.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XPath\XPathNavigatorIterator.cs" - Link = "..\..\..\Common\v1\src\XPath\XPathNavigatorIterator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XPath\XPathNavigatorReader.cs" Link = "..\..\..\Common\v1\src\XPath\XPathNavigatorReader.cs" SubType = "Code" |
|
From: Oleg T. <he...@us...> - 2004-11-09 12:25:02
|
Update of /cvsroot/mvp-xml/XInclude/v1/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22205/v1/src Modified Files: XInclude.csproj Log Message: Index: XInclude.csproj =================================================================== RCS file: /cvsroot/mvp-xml/XInclude/v1/src/XInclude.csproj,v retrieving revision 1.10 retrieving revision 1.11 diff -u -d -r1.10 -r1.11 --- XInclude.csproj 8 Nov 2004 15:19:35 -0000 1.10 +++ XInclude.csproj 9 Nov 2004 12:24:52 -0000 1.11 @@ -151,60 +151,24 @@ BuildAction = "Compile" /> <File - RelPath = "Common\XmlFirstLowerWriter.cs" - Link = "..\..\..\Common\v1\src\XmlFirstLowerWriter.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XmlFirstUpperReader.cs" - Link = "..\..\..\Common\v1\src\XmlFirstUpperReader.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XmlFragmentStream.cs" - Link = "..\..\..\Common\v1\src\XmlFragmentStream.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XmlNamespaces.cs" Link = "..\..\..\Common\v1\src\XmlNamespaces.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XmlNodeFactory.cs" - Link = "..\..\..\Common\v1\src\XmlNodeFactory.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XmlNodeListFactory.cs" Link = "..\..\..\Common\v1\src\XmlNodeListFactory.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XmlParsedWriter.cs" - Link = "..\..\..\Common\v1\src\XmlParsedWriter.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XmlPrefix.cs" Link = "..\..\..\Common\v1\src\XmlPrefix.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XmlTransformingReader.cs" - Link = "..\..\..\Common\v1\src\XmlTransformingReader.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XPath\DynamicContext.cs" Link = "..\..\..\Common\v1\src\XPath\DynamicContext.cs" SubType = "Code" @@ -217,36 +181,12 @@ BuildAction = "Compile" /> <File - RelPath = "Common\XPath\IndexingXPathNavigator.cs" - Link = "..\..\..\Common\v1\src\XPath\IndexingXPathNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XPath\SubtreeeXPathNavigator.cs" - Link = "..\..\..\Common\v1\src\XPath\SubtreeeXPathNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Common\XPath\XmlNodeNavigator.cs" - Link = "..\..\..\Common\v1\src\XPath\XmlNodeNavigator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XPath\XPathCache.cs" Link = "..\..\..\Common\v1\src\XPath\XPathCache.cs" SubType = "Code" BuildAction = "Compile" /> <File - RelPath = "Common\XPath\XPathNavigatorIterator.cs" - Link = "..\..\..\Common\v1\src\XPath\XPathNavigatorIterator.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File RelPath = "Common\XPath\XPathNavigatorReader.cs" Link = "..\..\..\Common\v1\src\XPath\XPathNavigatorReader.cs" SubType = "Code" |
