From: Oleg T. <he...@us...> - 2005-12-01 16:19:08
|
Update of /cvsroot/mvp-xml/nxslt/v2/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28477/v2/src Modified Files: NXsltArgumentsParser.cs NXsltOptions.cs NXsltStrings.Designer.cs NXsltStrings.resx NxsltMain.cs Reporter.cs nxslt2.csproj Added Files: MethodRenamer.exe MethodRenamer.exe.config Log Message: --- NEW FILE: MethodRenamer.exe.config --- (This appears to be a binary file; contents omitted.) Index: Reporter.cs =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/Reporter.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- Reporter.cs 29 Nov 2005 22:05:36 -0000 1.1 +++ Reporter.cs 1 Dec 2005 16:18:53 -0000 1.2 @@ -6,115 +6,117 @@ namespace XmlLab.nxslt { - /// <summary> - /// nxslt reporter class. - /// </summary> - internal class Reporter - { - private static TextWriter stdout = Console.Out; - private static TextWriter stderr = Console.Error; - /// <summary> - /// Reports command line parsing error. - /// </summary> - /// <param name="msg">Error message</param> - public static void ReportCommandLineParsingError(string msg) - { - ReportUsage(); - stderr.WriteLine(NXsltStrings.ErrorCommandLineParsing); - stderr.WriteLine(); - stderr.WriteLine(msg); - } - - /// <summary> - /// Reports an error. - /// </summary> - /// <param name="msg">Error message</param> - public static void ReportError(string msg) + /// nxslt reporter class. + /// </summary> + internal class Reporter { - stderr.WriteLine(); - stderr.WriteLine(msg); - stderr.WriteLine(); - } + private static TextWriter stdout = Console.Out; + private static TextWriter stderr = Console.Error; - /// <summary> - /// Reports an error. - /// </summary> - /// <param name="msg">Error message</param> - /// <param name="arg">Message argument</param> - public static void ReportError(string msg, params string[] args) - { - stderr.WriteLine(); - stderr.WriteLine(msg, args); - stderr.WriteLine(); - } + /// <summary> + /// Reports command line parsing error. + /// </summary> + /// <param name="msg">Error message</param> + public static void ReportCommandLineParsingError(string msg) + { + ReportUsage(); + stderr.WriteLine(NXsltStrings.ErrorCommandLineParsing); + stderr.WriteLine(); + stderr.WriteLine(msg); + } - /// <summary> - /// Reports command line parsing error. - /// </summary> - /// <param name="msg">Error message</param> - /// <param name="arg">Message argument</param> - public static void ReportCommandLineParsingError(string msg, params string[] args) - { - ReportUsage(); - stderr.WriteLine(NXsltStrings.ErrorCommandLineParsing); - stderr.WriteLine(); - stderr.WriteLine(msg, args); - } + /// <summary> + /// Reports an error. + /// </summary> + /// <param name="msg">Error message</param> + public static void ReportError(string msg) + { + stderr.WriteLine(); + stderr.WriteLine(msg); + stderr.WriteLine(); + } - /// <summary> - /// Prints nxslt usage info. - /// </summary> - public static void ReportUsage() - { - Version ver = Assembly.GetExecutingAssembly().GetName().Version; - stderr.WriteLine(NXsltStrings.UsageHeader, - ver.Major, ver.Minor, ver.Build, - System.Environment.Version.Major, System.Environment.Version.Minor, - System.Environment.Version.Build, System.Environment.Version.Revision); - stderr.WriteLine(); - stderr.WriteLine(NXsltStrings.UsageBody); - } + /// <summary> + /// Reports an error. + /// </summary> + /// <param name="msg">Error message</param> + /// <param name="arg">Message argument</param> + public static void ReportError(string msg, params string[] args) + { + stderr.WriteLine(); + stderr.WriteLine(msg, args); + stderr.WriteLine(); + } - /// <summary> - /// Prints timing info. - /// </summary> - public static void ReportTimings(ref NXsltTimings timings) - { - Version ver = Assembly.GetExecutingAssembly().GetName().Version; - stderr.WriteLine(NXsltStrings.UsageHeader, - ver.Major, ver.Minor, ver.Build, - System.Environment.Version.Major, System.Environment.Version.Minor, - System.Environment.Version.Build, System.Environment.Version.Revision); - stderr.WriteLine(); - stderr.WriteLine(NXsltStrings.Timings, timings.XsltCompileTime, - timings.XsltExecutionTime, timings.TotalRunTime); - } + /// <summary> + /// Reports command line parsing error. + /// </summary> + /// <param name="msg">Error message</param> + /// <param name="arg">Message argument</param> + public static void ReportCommandLineParsingError(string msg, params string[] args) + { + ReportUsage(); + stderr.WriteLine(NXsltStrings.ErrorCommandLineParsing); + stderr.WriteLine(); + stderr.WriteLine(msg, args); + } - /// <summary> - /// Returns full exception's message (including inner exceptions); - /// </summary> - public static String GetFullMessage(Exception e) - { - Exception ex = e; - StringBuilder msg = new StringBuilder(); - while (ex != null) - { - if (ex is NXsltException) + /// <summary> + /// Prints nxslt usage info. + /// </summary> + public static void ReportUsage() { - msg.AppendFormat(ex.Message); + Version ver = Assembly.GetExecutingAssembly().GetName().Version; + stderr.WriteLine(NXsltStrings.UsageHeader, + ver.Major, ver.Minor, ver.Build, + System.Environment.Version.Major, System.Environment.Version.Minor, + System.Environment.Version.Build, System.Environment.Version.Revision); + stderr.WriteLine(); + stderr.WriteLine(NXsltStrings.UsageBody); } - else + + /// <summary> + /// Prints timing info. + /// </summary> + public static void ReportTimings(ref NXsltTimings timings) { - msg.AppendFormat("{0}: {1}", ex.GetType().FullName, ex.Message); + stderr.WriteLine(); + stderr.WriteLine(); + Version ver = Assembly.GetExecutingAssembly().GetName().Version; + stderr.WriteLine(NXsltStrings.UsageHeader, + ver.Major, ver.Minor, ver.Build, + System.Environment.Version.Major, System.Environment.Version.Minor, + System.Environment.Version.Build, System.Environment.Version.Revision); + stderr.WriteLine(); + stderr.WriteLine(NXsltStrings.Timings, timings.XsltCompileTime, + timings.XsltExecutionTime, timings.TotalRunTime); } - if (ex.InnerException != null) + + /// <summary> + /// Returns full exception's message (including inner exceptions); + /// </summary> + public static String GetFullMessage(Exception e) { - msg.Append(" ---> "); + Exception ex = e; + StringBuilder msg = new StringBuilder(); + while (ex != null) + { + if (ex is NXsltException) + { + msg.AppendFormat(ex.Message); + } + else + { + msg.AppendFormat("{0}: {1}", ex.GetType().FullName, ex.Message); + } + if (ex.InnerException != null) + { + msg.Append(" ---> "); + } + ex = ex.InnerException; + } + return msg.ToString(); } - ex = ex.InnerException; - } - return msg.ToString(); } - } } Index: NXsltArgumentsParser.cs =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NXsltArgumentsParser.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NXsltArgumentsParser.cs 29 Nov 2005 22:05:36 -0000 1.1 +++ NXsltArgumentsParser.cs 1 Dec 2005 16:18:51 -0000 1.2 @@ -50,19 +50,7 @@ //Next argument must be filename options.OutFile = args[++i]; break; - } - case "-exslt": - if (i == args.Length - 1) - { - //Absent exslt lib path - throw new NXsltCommandLineParsingException(NXsltStrings.ErrorMissingExsltLibPath); - } - else - { - //Next argument must be lib path - options.ExsltLibPath = args[++i]; - break; - } + } //Show timings case "-t": options.ShowTiming = true; Index: NXsltStrings.Designer.cs =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NXsltStrings.Designer.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NXsltStrings.Designer.cs 29 Nov 2005 22:05:36 -0000 1.1 +++ NXsltStrings.Designer.cs 1 Dec 2005 16:18:53 -0000 1.2 @@ -1,7 +1,7 @@ //------------------------------------------------------------------------------ // <auto-generated> // This code was generated by a tool. -// Runtime Version:2.0.50727.26 +// Runtime Version:2.0.50727.42 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -501,8 +501,8 @@ } /// <summary> - /// Looks up a localized string similar to .NET XSLT command line utility, version {0}.{1} Beta1 build {2} - ///(c) 2004 Oleg Tkachenko, http://www.xmllab.net + /// Looks up a localized string similar to .NET XSLT command line utility, version {0}.{1} build {2} + ///(c) 2004-2005 Oleg Tkachenko, http://www.xmllab.net ///Running under .NET {3}.{4}.{5}.{6}. /// </summary> internal static string UsageHeader { Index: NXsltStrings.resx =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NXsltStrings.resx,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NXsltStrings.resx 29 Nov 2005 22:05:36 -0000 1.1 +++ NXsltStrings.resx 1 Dec 2005 16:18:53 -0000 1.2 @@ -115,8 +115,8 @@ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value> </resheader> <data name="UsageHeader"> - <value xml:space="preserve">.NET XSLT command line utility, version {0}.{1} Beta1 build {2} -(c) 2004 Oleg Tkachenko, http://www.xmllab.net + <value xml:space="preserve">.NET XSLT command line utility, version {0}.{1} build {2} +(c) 2004-2005 Oleg Tkachenko, http://www.xmllab.net Running under .NET {3}.{4}.{5}.{6}</value> </data> <data name="UsageBody"> @@ -137,15 +137,13 @@ -af Assembly file name to look up URI resolver class -an Assembly full or partial name to look up URI resolver class -mo Allow multiple output documents - -ext Comma-separated list of extension object class names - -exslt Use specified EXSLT.NET assembly instead of built-in - implementation (#GAC to load the assembly from the GAC) + -ext Comma-separated list of extension object class names -xmlc creds Credentials in username:password@domain format to be used in Web request authentications when loading source XML -xslc creds Credentials in username:password@domain format to be used in Web request authentications when loading XSLT - Dash used as source argument loads XML from stdin - - Dash used as stylesheet argument loads XSL from stdin + - Dash used as stylesheet argument loads XSLT from stdin </value> </data> <data name="ErrorCommandLineParsing"> Index: NXsltOptions.cs =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NXsltOptions.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NXsltOptions.cs 29 Nov 2005 22:05:36 -0000 1.1 +++ NXsltOptions.cs 1 Dec 2005 16:18:53 -0000 1.2 @@ -26,8 +26,7 @@ private string assemblyFileName; private string assemblyName; private bool multiOutput = false; - private string[] extClasses; - private string exsltLibPath; + private string[] extClasses; private NetworkCredential sourceCredential; private NetworkCredential xslCredential; private bool noSourceXml; @@ -212,16 +211,7 @@ { get { return multiOutput; } set { multiOutput = value; } - } - - /// <summary> - /// External EXSLT library path - /// </summary> - public string ExsltLibPath - { - get { return exsltLibPath; } - set { exsltLibPath = value; } - } + } /// <summary> /// No source XML --- NEW FILE: MethodRenamer.exe --- (This appears to be a binary file; contents omitted.) Index: NxsltMain.cs =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/NxsltMain.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- NxsltMain.cs 29 Nov 2005 22:05:36 -0000 1.1 +++ NxsltMain.cs 1 Dec 2005 16:18:53 -0000 1.2 @@ -1,3 +1,4 @@ +#region using using System; using System.Xml.XPath; using System.Xml.Xsl; @@ -7,8 +8,9 @@ using System.Net; using System.Text; using System.Diagnostics; -//using GotDotNet.Exslt; -//using Mvp.Xml.XInclude; +using Mvp.Xml.XInclude; +using Mvp.Xml.Common.Xsl; +#endregion namespace XmlLab.nxslt { @@ -98,19 +100,7 @@ { Reporter.ReportCommandLineParsingError(NXsltStrings.ErrorStylesheetAndPrettyPrintMode); return RETURN_CODE_ERROR; - } - - //Check supported features - if (options.MultiOutput) - { - Reporter.ReportError("Multioutput support is not implemented yet."); - return RETURN_CODE_ERROR; - } - if (options.ExsltLibPath != null) - { - Reporter.ReportError("EXSLT support is not implemented yet."); - return RETURN_CODE_ERROR; - } + } //Prepare source XML reader XmlReader srcReader = PrepareSourceReader(); if (options.PrettyPrintMode) @@ -131,12 +121,12 @@ XPathNavigator srcNav = srcDoc.CreateNavigator(); //Now srcReader reads in-memory cache instead srcReader = srcNav.ReadSubtree(); - XslCompiledTransform xslt = PrepareStylesheetFromPI(srcNav, stylesheetResolver); + MvpXslTransform xslt = PrepareStylesheetFromPI(srcNav, stylesheetResolver); Transform(srcReader, xslt, stylesheetResolver); } else { - XslCompiledTransform xslt = PrepareStylesheet(stylesheetResolver); + MvpXslTransform xslt = PrepareStylesheet(stylesheetResolver); Transform(srcReader, xslt, stylesheetResolver); } } @@ -153,7 +143,7 @@ /// <summary> /// Performs XSL Transformation. /// </summary> - private void Transform(XmlReader srcReader, XslCompiledTransform xslt, XmlResolver resolver) + private void Transform(XmlReader srcReader, MvpXslTransform xslt, XmlResolver resolver) { Stopwatch transformTimer = null; if (options.ShowTiming) @@ -200,11 +190,12 @@ /// <summary> /// Actual transformation and error handling. /// </summary> - private void TransformImpl(XmlReader srcReader, XslCompiledTransform xslt, XmlResolver resolver, XmlWriter results) + private void TransformImpl(XmlReader srcReader, MvpXslTransform xslt, XmlResolver resolver, XmlWriter results) { + xslt.MultiOutput = options.MultiOutput; try { - xslt.Transform(srcReader, options.XslArgList, results, resolver); + xslt.Transform(new XmlInput(srcReader, resolver), options.XslArgList, new XmlOutput(results)); } catch (XmlException xe) { @@ -226,7 +217,7 @@ /// <summary> /// Prepares, loads and compiles XSLT stylesheet. /// </summary> - private XslCompiledTransform PrepareStylesheet(XmlResolver stylesheetResolver) + private MvpXslTransform PrepareStylesheet(XmlResolver stylesheetResolver) { Stopwatch xsltCompileTimer = null; if (options.ShowTiming) @@ -236,7 +227,7 @@ } XmlReader stylesheetReader = PrepareStylesheetReader(stylesheetResolver); - XslCompiledTransform xslt = CreateTransform(stylesheetResolver, stylesheetReader); + MvpXslTransform xslt = CreateTransform(stylesheetResolver, stylesheetReader); //Save stylesheet loading/compilation time if (options.ShowTiming) @@ -251,9 +242,9 @@ /// <summary> /// Creates XslCompiledTransform instance for given reader and resolver. /// </summary> - private XslCompiledTransform CreateTransform(XmlResolver stylesheetResolver, XmlReader stylesheetReader) + private MvpXslTransform CreateTransform(XmlResolver stylesheetResolver, XmlReader stylesheetReader) { - XslCompiledTransform xslt = new XslCompiledTransform(); + MvpXslTransform xslt = new MvpXslTransform(); try { xslt.Load(stylesheetReader, XsltSettings.TrustedXslt, stylesheetResolver); @@ -274,7 +265,7 @@ /// <summary> /// Prepares, loads and compiles XSLT stylesheet referenced in the PI. /// </summary> - private XslCompiledTransform PrepareStylesheetFromPI(XPathNavigator srcNav, XmlResolver stylesheetResolver) + private MvpXslTransform PrepareStylesheetFromPI(XPathNavigator srcNav, XmlResolver stylesheetResolver) { Stopwatch xsltCompileTimer = null; if (options.ShowTiming) @@ -291,7 +282,7 @@ //Found PI node, look for the href pseudo attribute string href = Utils.ExtractStylsheetHrefFromPI(pi); - XslCompiledTransform xslt = null; + MvpXslTransform xslt = null; if (href.StartsWith("#")) { Index: nxslt2.csproj =================================================================== RCS file: /cvsroot/mvp-xml/nxslt/v2/src/nxslt2.csproj,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- nxslt2.csproj 29 Nov 2005 22:05:36 -0000 1.1 +++ nxslt2.csproj 1 Dec 2005 16:18:53 -0000 1.2 @@ -42,9 +42,175 @@ <ItemGroup> <Reference Include="System" /> <Reference Include="System.Data" /> + <Reference Include="System.Web" /> <Reference Include="System.Xml" /> </ItemGroup> <ItemGroup> + <Compile Include="..\..\..\Common\v2\src\SR.cs"> + <Link>Common\SR.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XmlBaseAwareXmlTextReader.cs"> + <Link>Common\XmlBaseAwareXmlTextReader.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XmlNamespaces.cs"> + <Link>Common\XmlNamespaces.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XmlNodeListFactory.cs"> + <Link>Common\XmlNodeListFactory.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XmlPrefix.cs"> + <Link>Common\XmlPrefix.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\DynamicContext.cs"> + <Link>Common\XPath\DynamicContext.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\EmptyXPathNodeIterator.cs"> + <Link>Common\XPath\EmptyXPathNodeIterator.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\IHasXPathNavigator.cs"> + <Link>Common\XPath\IHasXPathNavigator.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\SubtreeeXPathNavigator.cs"> + <Link>Common\XPath\SubtreeeXPathNavigator.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\XPathCache.cs"> + <Link>Common\XPath\XPathCache.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\XPathNavigatorIterator.cs"> + <Link>Common\XPath\XPathNavigatorIterator.cs</Link> + </Compile> + <Compile Include="..\..\..\Common\v2\src\XPath\XPathVariable.cs"> + <Link>Common\XPath\XPathVariable.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltContext.cs"> + <Link>Exslt\ExsltContext.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltContextFunction.cs"> + <Link>Exslt\ExsltContextFunction.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltDatesAndTimes.cs"> + <Link>Exslt\ExsltDatesAndTimes.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltMath.cs"> + <Link>Exslt\ExsltMath.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltNamespaces.cs"> + <Link>Exslt\ExsltNamespaces.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltRandom.cs"> + <Link>Exslt\ExsltRandom.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltRegularExpressions.cs"> + <Link>Exslt\ExsltRegularExpressions.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltSets.cs"> + <Link>Exslt\ExsltSets.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltStrings.cs"> + <Link>Exslt\ExsltStrings.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\ExsltTransform.cs"> + <Link>Exslt\ExsltTransform.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\GDNDatesAndTimes.cs"> + <Link>Exslt\GDNDatesAndTimes.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\GDNDynamic.cs"> + <Link>Exslt\GDNDynamic.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\GDNMath.cs"> + <Link>Exslt\GDNMath.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\GDNRegularExpressions.cs"> + <Link>Exslt\GDNRegularExpressions.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\GDNSets.cs"> + <Link>Exslt\GDNSets.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\GDNStrings.cs"> + <Link>Exslt\GDNStrings.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\MultiOutput\MultiXmlTextWriter.cs"> + <Link>Exslt\MultiOutput\MultiXmlTextWriter.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\MultiOutput\OutputState.cs"> + <Link>Exslt\MultiOutput\OutputState.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\Xsl\IXmlTransform.cs"> + <Link>Common\Xsl\IXmlTransform.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\Xsl\MvpXslTransform.cs"> + <Link>Common\Xsl\MvpXslTransform.cs</Link> + </Compile> + <Compile Include="..\..\..\EXSLT\v2\src\Exslt\Xsl\XslReader.cs"> + <Link>Common\Xsl\XslReader.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\SR.cs"> + <Link>XInclude\SR.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\TextIncludingReader.cs"> + <Link>XInclude\TextIncludingReader.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\TextUtils.cs"> + <Link>XInclude\TextUtils.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\XIncludeException.cs"> + <Link>XInclude\XIncludeException.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\XIncludeKeywords.cs"> + <Link>XInclude\XIncludeKeywords.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\XIncludingReader.cs"> + <Link>XInclude\XIncludingReader.cs</Link> + </Compile> + <Compile Include="..\..\..\XInclude\v2\src\XIncludingReaderState.cs"> + <Link>XInclude\XIncludingReaderState.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\ElementSchemaPointerPart.cs"> + <Link>XPointer\ElementSchemaPointerPart.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\LexUtils.cs"> + <Link>XPointer\LexUtils.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\Pointer.cs"> + <Link>XPointer\Pointer.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\PointerPart.cs"> + <Link>XPointer\PointerPart.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\SchemaBasedPointer.cs"> + <Link>XPointer\SchemaBasedPointer.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\ShorthandPointer.cs"> + <Link>XPointer\ShorthandPointer.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\SR.cs"> + <Link>XPointer\SR.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XmlnsSchemaPointerPart.cs"> + <Link>XPointer\XmlnsSchemaPointerPart.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPath1SchemaPointerPart.cs"> + <Link>XPointer\XPath1SchemaPointerPart.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPointerException.cs"> + <Link>XPointer\XPointerException.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPointerLexer.cs"> + <Link>XPointer\XPointerLexer.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPointerParser.cs"> + <Link>XPointer\XPointerParser.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPointerReader.cs"> + <Link>XPointer\XPointerReader.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPointerSchema.cs"> + <Link>XPointer\XPointerSchema.cs</Link> + </Compile> + <Compile Include="..\..\..\XPointer\v2\src\XPointerSchemaPointerPart.cs"> + <Link>XPointer\XPointerSchemaPointerPart.cs</Link> + </Compile> <Compile Include="NxsltCommandLineParsingException.cs" /> <Compile Include="NxsltException.cs" /> <Compile Include="NXsltStrings.Designer.cs"> @@ -62,6 +228,21 @@ <Compile Include="Utils.cs" /> </ItemGroup> <ItemGroup> + <EmbeddedResource Include="..\..\..\Common\v2\src\SR.resx"> + <Link>Common\SR.resx</Link> + <DependentUpon>SR.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="..\..\..\XInclude\v2\src\SR.resx"> + <Link>XInclude\SR.resx</Link> + <DependentUpon>SR.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> + <EmbeddedResource Include="..\..\..\XPointer\v2\src\SR.resx"> + <Link>XPointer\SR.resx</Link> + <DependentUpon>SR.cs</DependentUpon> + <SubType>Designer</SubType> + </EmbeddedResource> <EmbeddedResource Include="NXsltStrings.resx"> <Generator>ResXFileCodeGenerator</Generator> <SubType>Designer</SubType> @@ -77,4 +258,20 @@ <None Include="nxslt.snk" /> </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <PropertyGroup> + <PostBuildEvent>@echo ########### nxslt Custom Build Event has started +@echo ########### Setting environment variables +call "$(DevEnvDir)..\Tools\vsvars32.bat" +@echo ########### Disassembing... +ildasm "$(TargetFileName)" /out=nxslt.il /nobar +@echo ########### Renaming EXSLT methods... +"$(ProjectDir)MethodRenamer.exe" nxslt.il nxslt.fixed.il +@echo ########### Assembling library back... +ilasm nxslt.fixed.il /RESOURCE=nxslt.res /EXE /OUTPUT="$(TargetFileName)" /KEY="$(ProjectDir)nxslt.snk" +@echo ########### Cleaning... +del nxslt.res +del *.il +del *.resources +@echo ########### nxslt Custom Build Event has finished</PostBuildEvent> + </PropertyGroup> </Project> \ No newline at end of file |