From: Oleg T. <he...@us...> - 2005-10-15 21:24:26
|
Update of /cvsroot/mvp-xml/EXSLT/v1/src/Exslt In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18560 Modified Files: AssemblyInfo.cs Exslt.csproj ExsltContext.cs ExsltSets.cs ExsltTransform.cs Log Message: Index: ExsltTransform.cs =================================================================== RCS file: /cvsroot/mvp-xml/EXSLT/v1/src/Exslt/ExsltTransform.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ExsltTransform.cs 20 Jul 2005 20:15:47 -0000 1.2 +++ ExsltTransform.cs 15 Oct 2005 21:24:17 -0000 1.3 @@ -79,12 +79,7 @@ /// Bitwise enumeration used to specify which EXSLT functions should be accessible to /// the ExsltTransform object. The default value is ExsltFunctionNamespace.All /// </summary> - private ExsltFunctionNamespace _supportedFunctions = ExsltFunctionNamespace.All; - - /// <summary> - /// Extension object which implements the functions in the http://exslt.org/common namespace - /// </summary> - private ExsltCommon exsltCommon = new ExsltCommon(); + private ExsltFunctionNamespace _supportedFunctions = ExsltFunctionNamespace.All; /// <summary> /// Extension object which implements the functions in the http://exslt.org/math namespace Index: AssemblyInfo.cs =================================================================== RCS file: /cvsroot/mvp-xml/EXSLT/v1/src/Exslt/AssemblyInfo.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- AssemblyInfo.cs 19 Jul 2005 19:46:54 -0000 1.1 +++ AssemblyInfo.cs 15 Oct 2005 21:24:17 -0000 1.2 @@ -32,7 +32,7 @@ // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.3.*")] +[assembly: AssemblyVersion("2.0.*")] // // In order to sign your assembly you must specify a key to use. Refer to the Index: Exslt.csproj =================================================================== RCS file: /cvsroot/mvp-xml/EXSLT/v1/src/Exslt/Exslt.csproj,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- Exslt.csproj 20 Jul 2005 20:15:38 -0000 1.2 +++ Exslt.csproj 15 Oct 2005 21:24:17 -0000 1.3 @@ -1,214 +1,163 @@ -<VisualStudioProject> - <CSHARP - ProjectType = "Local" - ProductVersion = "7.10.3077" - SchemaVersion = "2.0" - ProjectGuid = "{BA694D9F-6B1E-4038-AC81-BF1640C07D90}" - > - <Build> - <Settings - ApplicationIcon = "" - AssemblyKeyContainerName = "" - AssemblyName = "Mvp.Xml.Exslt" - AssemblyOriginatorKeyFile = "" - DefaultClientScript = "JScript" - DefaultHTMLPageLayout = "Grid" - DefaultTargetSchema = "IE50" - DelaySign = "false" - OutputType = "Library" - PreBuildEvent = "" - PostBuildEvent = '@echo ########### Setting environment variables
call "$(DevEnvDir)..\Tools\vsvars32.bat"
nmake' - RootNamespace = "Mvp.Xml.Exslt" - RunPostBuildEvent = "OnBuildSuccess" - StartupObject = "" - > - <Config - Name = "Debug" - AllowUnsafeBlocks = "false" - BaseAddress = "285212672" - CheckForOverflowUnderflow = "false" - ConfigurationOverrideFile = "" - DefineConstants = "DEBUG;TRACE;NET11" - DocumentationFile = "" - DebugSymbols = "true" - FileAlignment = "4096" - IncrementalBuild = "true" - NoStdLib = "false" - NoWarn = "" - Optimize = "false" - OutputPath = ".\" - RegisterForComInterop = "false" - RemoveIntegerChecks = "false" - TreatWarningsAsErrors = "false" - WarningLevel = "4" - /> - <Config - Name = "Release" - AllowUnsafeBlocks = "false" - BaseAddress = "285212672" - CheckForOverflowUnderflow = "false" - ConfigurationOverrideFile = "" - DefineConstants = "TRACE;NET11" - DocumentationFile = "" - DebugSymbols = "false" - FileAlignment = "4096" - IncrementalBuild = "false" - NoStdLib = "false" - NoWarn = "" - Optimize = "true" - OutputPath = ".\" - RegisterForComInterop = "false" - RemoveIntegerChecks = "false" - TreatWarningsAsErrors = "false" - WarningLevel = "4" - /> - </Settings> - <References> - <Reference - Name = "System" - AssemblyName = "System" - HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll" - /> - <Reference - Name = "System.Data" - AssemblyName = "System.Data" - HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll" - /> - <Reference - Name = "System.XML" - AssemblyName = "System.Xml" - HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll" - /> - <Reference - Name = "System.Drawing" - AssemblyName = "System.Drawing" - HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll" - /> - <Reference - Name = "System.Windows.Forms" - AssemblyName = "System.Windows.Forms" - HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Windows.Forms.dll" - /> - <Reference - Name = "System.Web" - AssemblyName = "System.Web" - HintPath = "C:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Web.dll" - /> - </References> - </Build> - <Files> - <Include> - <File - RelPath = "AssemblyInfo.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltCommon.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltContext.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltContextFunction.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltDatesAndTimes.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltMath.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltNamespaces.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltNodeList.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltRandom.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltRegularExpressions.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltSets.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltStrings.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "ExsltTransform.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "GDNDatesAndTimes.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "GDNDynamic.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "GDNMath.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "GDNRegularExpressions.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "GDNSets.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "GDNStrings.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "Makefile" - BuildAction = "Content" - /> - <File - RelPath = "MultiOutput\MultiXmlTextWriter.cs" - SubType = "Code" - BuildAction = "Compile" - /> - <File - RelPath = "MultiOutput\OutputState.cs" - SubType = "Code" - BuildAction = "Compile" - /> - </Include> - </Files> - </CSHARP> -</VisualStudioProject> - +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup> + <ProjectType>Local</ProjectType> + <ProductVersion>8.0.50215</ProductVersion> + <SchemaVersion>2.0</SchemaVersion> + <ProjectGuid>{BA694D9F-6B1E-4038-AC81-BF1640C07D90}</ProjectGuid> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ApplicationIcon> + </ApplicationIcon> + <AssemblyKeyContainerName> + </AssemblyKeyContainerName> + <AssemblyName>Mvp.Xml.Exslt</AssemblyName> + <AssemblyOriginatorKeyFile> + </AssemblyOriginatorKeyFile> + <DefaultClientScript>JScript</DefaultClientScript> + <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout> + <DefaultTargetSchema>IE50</DefaultTargetSchema> + <DelaySign>false</DelaySign> + <OutputType>Library</OutputType> + <RootNamespace>Mvp.Xml.Exslt</RootNamespace> + <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent> + <StartupObject> + </StartupObject> + <FileUpgradeFlags> + </FileUpgradeFlags> + <UpgradeBackupLocation> + </UpgradeBackupLocation> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <OutputPath>.\</OutputPath> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <BaseAddress>285212672</BaseAddress> + <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> + <ConfigurationOverrideFile> + </ConfigurationOverrideFile> + <DefineConstants>DEBUG;TRACE;NET11</DefineConstants> + <DocumentationFile> + </DocumentationFile> + <DebugSymbols>true</DebugSymbols> + <FileAlignment>4096</FileAlignment> + <NoStdLib>false</NoStdLib> + <NoWarn> + </NoWarn> + <Optimize>false</Optimize> + <RegisterForComInterop>false</RegisterForComInterop> + <RemoveIntegerChecks>false</RemoveIntegerChecks> + <TreatWarningsAsErrors>false</TreatWarningsAsErrors> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <OutputPath>.\</OutputPath> + <AllowUnsafeBlocks>false</AllowUnsafeBlocks> + <BaseAddress>285212672</BaseAddress> + <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow> + <ConfigurationOverrideFile> + </ConfigurationOverrideFile> + <DefineConstants>TRACE;NET11</DefineConstants> + <DocumentationFile> + </DocumentationFile> + <DebugSymbols>false</DebugSymbols> + <FileAlignment>4096</FileAlignment> + <NoStdLib>false</NoStdLib> + <NoWarn> + </NoWarn> + <Optimize>true</Optimize> + <RegisterForComInterop>false</RegisterForComInterop> + <RemoveIntegerChecks>false</RemoveIntegerChecks> + <TreatWarningsAsErrors>false</TreatWarningsAsErrors> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <ItemGroup> + <Reference Include="System"> + <Name>System</Name> + </Reference> + <Reference Include="System.Data"> + <Name>System.Data</Name> + </Reference> + <Reference Include="System.Drawing"> + <Name>System.Drawing</Name> + </Reference> + <Reference Include="System.Web"> + <Name>System.Web</Name> + </Reference> + <Reference Include="System.Windows.Forms"> + <Name>System.Windows.Forms</Name> + </Reference> + <Reference Include="System.Xml"> + <Name>System.XML</Name> + </Reference> + </ItemGroup> + <ItemGroup> + <Compile Include="AssemblyInfo.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltContext.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltContextFunction.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltDatesAndTimes.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltMath.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltNamespaces.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltNodeList.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltRandom.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltRegularExpressions.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltSets.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltStrings.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="ExsltTransform.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="GDNDatesAndTimes.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="GDNDynamic.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="GDNMath.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="GDNRegularExpressions.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="GDNSets.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="GDNStrings.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="MultiOutput\MultiXmlTextWriter.cs"> + <SubType>Code</SubType> + </Compile> + <Compile Include="MultiOutput\OutputState.cs"> + <SubType>Code</SubType> + </Compile> + <Content Include="Makefile" /> + </ItemGroup> + <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> + <PropertyGroup> + <PreBuildEvent> + </PreBuildEvent> + <PostBuildEvent>@echo ########### Setting environment variables +call "$(DevEnvDir)..\Tools\vsvars32.bat" +nmake</PostBuildEvent> + </PropertyGroup> +</Project> \ No newline at end of file Index: ExsltContext.cs =================================================================== RCS file: /cvsroot/mvp-xml/EXSLT/v1/src/Exslt/ExsltContext.cs,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- ExsltContext.cs 19 Jul 2005 19:46:54 -0000 1.1 +++ ExsltContext.cs 15 Oct 2005 21:24:17 -0000 1.2 @@ -24,12 +24,7 @@ /// Bitwise enumeration used to specify which EXSLT functions should be accessible to /// in the ExsltContext object. The default value is ExsltFunctionNamespace.All /// </summary> - private ExsltFunctionNamespace _supportedFunctions = ExsltFunctionNamespace.All; - - /// <summary> - /// Extension object which implements the functions in the http://exslt.org/common namespace - /// </summary> - private ExsltCommon exsltCommon = new ExsltCommon(); + private ExsltFunctionNamespace _supportedFunctions = ExsltFunctionNamespace.All; /// <summary> /// Extension object which implements the functions in the http://exslt.org/math namespace Index: ExsltSets.cs =================================================================== RCS file: /cvsroot/mvp-xml/EXSLT/v1/src/Exslt/ExsltSets.cs,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ExsltSets.cs 20 Jul 2005 20:15:47 -0000 1.2 +++ ExsltSets.cs 15 Oct 2005 21:24:17 -0000 1.3 @@ -47,7 +47,7 @@ } } - return ExsltCommon.ExsltNodeListToXPathNodeIterator(nodelist1); + return nodelist1; } /// <summary> /// Implements an optimized algorithm for the following function |