You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by cc...@apache.org on 2012/07/16 22:36:33 UTC
svn commit: r1362240 [6/7] - in /incubator/lucene.net/trunk: build/scripts/
build/scripts/All/ build/scripts/Analyzers/ build/scripts/Contrib-Core/
build/scripts/Contrib/ build/scripts/Core/
build/scripts/FastVectorHighlighter/ build/scripts/Highlighte...
Modified: incubator/lucene.net/trunk/src/demo/DeleteFiles/DeleteFiles.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/DeleteFiles/DeleteFiles.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/DeleteFiles/DeleteFiles.csproj (original)
+++ incubator/lucene.net/trunk/src/demo/DeleteFiles/DeleteFiles.csproj Mon Jul 16 20:36:26 2012
@@ -19,7 +19,6 @@
under the License.
-->
-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<ProjectType>Local</ProjectType>
@@ -29,25 +28,18 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
+ <AssemblyKeyContainerName></AssemblyKeyContainerName>
<AssemblyName>DeleteFiles</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <OutputType>Exe</OutputType>
<RootNamespace>DeleteFiles</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags></FileUpgradeFlags>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -66,20 +58,42 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\DeleteFiles\Debug\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\DeleteFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</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>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\DeleteFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -87,33 +101,64 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\DeleteFiles\Release\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\DeleteFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile>..\..\..\doc\demo\DeleteFiles.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn></NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>pdbonly</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\DeleteFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<DocumentationFile>..\..\..\doc\demo\DeleteFiles.xml</DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -164,9 +209,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PreBuildEvent></PreBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/demo/Demo.Common/Demo.Common.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/Demo.Common/Demo.Common.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/Demo.Common/Demo.Common.csproj (original)
+++ incubator/lucene.net/trunk/src/demo/Demo.Common/Demo.Common.csproj Mon Jul 16 20:36:26 2012
@@ -27,27 +27,20 @@
<ProjectGuid>{F04CA2F4-E182-46A8-B914-F46AF5319E83}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
+ <ApplicationIcon></ApplicationIcon>
+ <AssemblyKeyContainerName></AssemblyKeyContainerName>
<AssemblyName>Lucene.Net.Demo.Common</AssemblyName>
<AssemblyOriginatorKeyFile>Lucene.Net.snk</AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <OutputType>Library</OutputType>
<RootNamespace>DemoLib</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags></FileUpgradeFlags>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<SignAssembly>true</SignAssembly>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<OldToolsVersion>2.0</OldToolsVersion>
<IsWebBootstrapper>false</IsWebBootstrapper>
<PublishUrl>publish\</PublishUrl>
@@ -66,15 +59,38 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\build\bin\demo\Demo.Common\Debug\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\demo\Demo.Common\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618</NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\demo\Demo.Common\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -86,17 +102,19 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\..\build\bin\demo\Demo.Common\Release\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\demo\Demo.Common\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
- <DocumentationFile>..\..\..\build\bin\demo\Demo.Common\Release\Lucene.Net.Demo.Common.XML</DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile>..\..\..\build\bin\demo\Demo.Common\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Demo.Common.XML</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>618</NoWarn>
@@ -105,13 +123,38 @@
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\demo\Demo.Common\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile>..\..\..\build\bin\demo\Demo.Common\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Demo.Common.XML</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618</NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>pdbonly</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -195,9 +238,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PreBuildEvent></PreBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParser.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParser.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParser.cs (original)
+++ incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParser.cs Mon Jul 16 20:36:26 2012
@@ -22,7 +22,8 @@ using Lucene.Net.Support;
namespace Lucene.Net.Demo.Html
{
-
+#pragma warning disable 162,164
+
public class HTMLParser : HTMLParserConstants_Fields
{
private void InitBlock()
Modified: incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs (original)
+++ incubator/lucene.net/trunk/src/demo/Demo.Common/HTML/HTMLParserTokenManager.cs Mon Jul 16 20:36:26 2012
@@ -21,7 +21,8 @@ using System;
namespace Lucene.Net.Demo.Html
{
-
+#pragma warning disable 162,164
+
public class HTMLParserTokenManager : HTMLParserConstants_Fields
{
private void InitBlock()
Modified: incubator/lucene.net/trunk/src/demo/Demo.Common/HTMLDocument.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/Demo.Common/HTMLDocument.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/Demo.Common/HTMLDocument.cs (original)
+++ incubator/lucene.net/trunk/src/demo/Demo.Common/HTMLDocument.cs Mon Jul 16 20:36:26 2012
@@ -28,8 +28,8 @@ namespace Lucene.Net.Demo
public class HTMLDocument
{
internal static char dirSep = System.IO.Path.DirectorySeparatorChar.ToString()[0];
-
- public static System.String Uid(System.IO.FileInfo f)
+
+ public static System.String Uid(System.IO.DirectoryInfo f)
{
// Append path and date into a string in such a way that lexicographic
// sorting gives the same results as a walk of the file hierarchy. Thus
@@ -43,8 +43,8 @@ namespace Lucene.Net.Demo
System.String url = uid.Replace('\u0000', '/'); // replace nulls with slashes
return url.Substring(0, (url.LastIndexOf('/')) - (0)); // remove date from end
}
-
- public static Document Document(System.IO.FileInfo f)
+
+ public static Document Document(System.IO.DirectoryInfo f)
{
// make a new, empty document
Document doc = new Document();
Modified: incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.cs (original)
+++ incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.cs Mon Jul 16 20:36:26 2012
@@ -32,8 +32,8 @@ namespace Lucene.Net.Demo
private IndexFiles()
{
}
-
- internal static readonly System.IO.FileInfo INDEX_DIR = new System.IO.FileInfo("index");
+
+ internal static readonly System.IO.DirectoryInfo INDEX_DIR = new System.IO.DirectoryInfo("index");
/// <summary>Index all text files under a directory. </summary>
[STAThread]
@@ -56,8 +56,8 @@ namespace Lucene.Net.Demo
System.Console.Out.WriteLine("Cannot save index to '" + INDEX_DIR + "' directory, please delete it first");
System.Environment.Exit(1);
}
-
- System.IO.FileInfo docDir = new System.IO.FileInfo(args[0]);
+
+ var docDir = new System.IO.DirectoryInfo(args[0]);
bool tmpBool2;
if (System.IO.File.Exists(docDir.FullName))
tmpBool2 = true;
@@ -88,7 +88,7 @@ namespace Lucene.Net.Demo
}
}
- internal static void IndexDocs(IndexWriter writer, System.IO.FileInfo file)
+ internal static void IndexDocs(IndexWriter writer, System.IO.DirectoryInfo file)
{
// do not try to index files that cannot be read
// if (file.canRead()) // {{Aroush}} what is canRead() in C#?
@@ -101,7 +101,7 @@ namespace Lucene.Net.Demo
{
for (int i = 0; i < files.Length; i++)
{
- IndexDocs(writer, new System.IO.FileInfo(files[i]));
+ IndexDocs(writer, new System.IO.DirectoryInfo(files[i]));
}
}
}
Modified: incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.csproj (original)
+++ incubator/lucene.net/trunk/src/demo/IndexFiles/IndexFiles.csproj Mon Jul 16 20:36:26 2012
@@ -28,25 +28,18 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
+ <AssemblyKeyContainerName></AssemblyKeyContainerName>
<AssemblyName>IndexFiles</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <OutputType>Exe</OutputType>
<RootNamespace>IndexFiles</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags></FileUpgradeFlags>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -65,20 +58,42 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\IndexFiles\Debug\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</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>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -86,33 +101,64 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\IndexFiles\Release\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile>..\..\..\doc\demo\IndexFiles.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn></NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>pdbonly</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<DocumentationFile>..\..\..\doc\demo\IndexFiles.xml</DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -163,9 +209,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PreBuildEvent></PreBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.cs (original)
+++ incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.cs Mon Jul 16 20:36:26 2012
@@ -47,9 +47,9 @@ namespace Lucene.Net.Demo
{
try
{
- System.IO.FileInfo index = new System.IO.FileInfo("index");
+ var index = new System.IO.DirectoryInfo("index");
bool create = false;
- System.IO.FileInfo root = null;
+ System.IO.DirectoryInfo root = null;
System.String usage = "IndexHTML [-create] [-index <index>] <root_directory>";
@@ -64,7 +64,7 @@ namespace Lucene.Net.Demo
if (argv[i].Equals("-index"))
{
// parse -index option
- index = new System.IO.FileInfo(argv[++i]);
+ index = new System.IO.DirectoryInfo(argv[++i]);
}
else if (argv[i].Equals("-create"))
{
@@ -77,7 +77,7 @@ namespace Lucene.Net.Demo
return ;
}
else
- root = new System.IO.FileInfo(argv[i]);
+ root = new System.IO.DirectoryInfo(argv[i]);
}
if (root == null)
@@ -118,8 +118,8 @@ namespace Lucene.Net.Demo
/* be deleted; (b) unchanged documents, to be left alone; or (c) new
/* documents, to be indexed.
*/
-
- private static void IndexDocs(System.IO.FileInfo file, System.IO.FileInfo index, bool create)
+
+ private static void IndexDocs(System.IO.DirectoryInfo file, System.IO.DirectoryInfo index, bool create)
{
if (!create)
{
@@ -133,9 +133,9 @@ namespace Lucene.Net.Demo
if (deleting)
{
// delete rest of stale docs
- while (uidIter.Term() != null && (System.Object) uidIter.Term().Field() == (System.Object) "uid")
+ while (uidIter.Term() != null && (System.Object) uidIter.Term().Field == (System.Object) "uid")
{
- System.Console.Out.WriteLine("deleting " + HTMLDocument.Uid2url(uidIter.Term().Text()));
+ System.Console.Out.WriteLine("deleting " + HTMLDocument.Uid2url(uidIter.Term().Text));
reader.DeleteDocuments(uidIter.Term());
uidIter.Next();
}
@@ -149,8 +149,8 @@ namespace Lucene.Net.Demo
else
IndexDocs(file);
}
-
- private static void IndexDocs(System.IO.FileInfo file)
+
+ private static void IndexDocs(System.IO.DirectoryInfo file)
{
if (System.IO.Directory.Exists(file.FullName))
{
@@ -159,7 +159,7 @@ namespace Lucene.Net.Demo
System.Array.Sort(files); // sort the files
for (int i = 0; i < files.Length; i++)
// recursively index them
- IndexDocs(new System.IO.FileInfo(System.IO.Path.Combine(file.FullName, files[i])));
+ IndexDocs(new System.IO.DirectoryInfo(System.IO.Path.Combine(file.FullName, files[i])));
}
else if (file.FullName.EndsWith(".html") || file.FullName.EndsWith(".htm") || file.FullName.EndsWith(".txt"))
{
@@ -169,17 +169,17 @@ namespace Lucene.Net.Demo
{
System.String uid = HTMLDocument.Uid(file); // construct uid for doc
- while (uidIter.Term() != null && (System.Object) uidIter.Term().Field() == (System.Object) "uid" && String.CompareOrdinal(uidIter.Term().Text(), uid) < 0)
+ while (uidIter.Term() != null && (System.Object) uidIter.Term().Field == (System.Object) "uid" && String.CompareOrdinal(uidIter.Term().Text, uid) < 0)
{
if (deleting)
{
// delete stale docs
- System.Console.Out.WriteLine("deleting " + HTMLDocument.Uid2url(uidIter.Term().Text()));
+ System.Console.Out.WriteLine("deleting " + HTMLDocument.Uid2url(uidIter.Term().Text));
reader.DeleteDocuments(uidIter.Term());
}
uidIter.Next();
}
- if (uidIter.Term() != null && (System.Object) uidIter.Term().Field() == (System.Object) "uid" && String.CompareOrdinal(uidIter.Term().Text(), uid) == 0)
+ if (uidIter.Term() != null && (System.Object) uidIter.Term().Field == (System.Object) "uid" && String.CompareOrdinal(uidIter.Term().Text, uid) == 0)
{
uidIter.Next(); // keep matching docs
}
Modified: incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.csproj (original)
+++ incubator/lucene.net/trunk/src/demo/IndexHtml/IndexHtml.csproj Mon Jul 16 20:36:26 2012
@@ -28,25 +28,18 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
+ <AssemblyKeyContainerName></AssemblyKeyContainerName>
<AssemblyName>IndexHtml</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <OutputType>Exe</OutputType>
<RootNamespace>IndexHtml</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags></FileUpgradeFlags>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -65,20 +58,42 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\IndexHtml\Debug\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexHtml\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</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>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexHtml\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -86,33 +101,64 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\IndexHtml\Release\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexHtml\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile>..\..\..\doc\demo\IndexHtml.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn></NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>pdbonly</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\IndexHtml\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<DocumentationFile>..\..\..\doc\demo\IndexHtml.xml</DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -163,9 +209,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PreBuildEvent></PreBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.cs (original)
+++ incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.cs Mon Jul 16 20:36:26 2012
@@ -50,9 +50,9 @@ namespace Lucene.Net.Demo
System.Console.Out.WriteLine("doc=" + doc + docBase + " score=" + scorer.Score());
}
- public override bool AcceptsDocsOutOfOrder()
+ public override bool AcceptsDocsOutOfOrder
{
- return true;
+ get { return true; }
}
public override void SetNextReader(IndexReader reader, int docBase)
@@ -161,7 +161,7 @@ namespace Lucene.Net.Demo
}
}
- IndexReader reader = IndexReader.Open(FSDirectory.Open(new System.IO.FileInfo(index)), true); // only searching, so read-only=true
+ IndexReader reader = IndexReader.Open(FSDirectory.Open(new System.IO.DirectoryInfo(index)), true); // only searching, so read-only=true
if (normsField != null)
reader = new OneNormsReader(reader, normsField);
@@ -178,7 +178,7 @@ namespace Lucene.Net.Demo
{
in_Renamed = new System.IO.StreamReader(new System.IO.StreamReader(System.Console.OpenStandardInput(), System.Text.Encoding.GetEncoding("UTF-8")).BaseStream, new System.IO.StreamReader(System.Console.OpenStandardInput(), System.Text.Encoding.GetEncoding("UTF-8")).CurrentEncoding);
}
- QueryParser parser = new QueryParser(field, analyzer);
+ QueryParser parser = new QueryParser(Version.LUCENE_CURRENT, field, analyzer);
while (true)
{
if (queries == null)
@@ -248,11 +248,11 @@ namespace Lucene.Net.Demo
{
// Collect enough docs to show 5 pages
- TopScoreDocCollector collector = TopScoreDocCollector.create(5 * hitsPerPage, false);
+ TopScoreDocCollector collector = TopScoreDocCollector.Create(5 * hitsPerPage, false);
searcher.Search(query, collector);
- ScoreDoc[] hits = collector.TopDocs().scoreDocs;
+ ScoreDoc[] hits = collector.TopDocs().ScoreDocs;
- int numTotalHits = collector.GetTotalHits();
+ int numTotalHits = collector.TotalHits;
System.Console.Out.WriteLine(numTotalHits + " total matching documents");
int start = 0;
@@ -270,9 +270,9 @@ namespace Lucene.Net.Demo
break;
}
- collector = TopScoreDocCollector.create(numTotalHits, false);
+ collector = TopScoreDocCollector.Create(numTotalHits, false);
searcher.Search(query, collector);
- hits = collector.TopDocs().scoreDocs;
+ hits = collector.TopDocs().ScoreDocs;
}
end = System.Math.Min(hits.Length, start + hitsPerPage);
@@ -282,11 +282,11 @@ namespace Lucene.Net.Demo
if (raw)
{
// output raw format
- System.Console.Out.WriteLine("doc=" + hits[i].doc + " score=" + hits[i].score);
+ System.Console.Out.WriteLine("doc=" + hits[i].Doc + " score=" + hits[i].Score);
continue;
}
- Document doc = searcher.Doc(hits[i].doc);
+ Document doc = searcher.Doc(hits[i].Doc);
System.String path = doc.Get("path");
if (path != null)
{
Modified: incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.csproj (original)
+++ incubator/lucene.net/trunk/src/demo/SearchFiles/SearchFiles.csproj Mon Jul 16 20:36:26 2012
@@ -28,25 +28,18 @@
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ApplicationIcon>App.ico</ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
+ <AssemblyKeyContainerName></AssemblyKeyContainerName>
<AssemblyName>SearchFiles</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <OutputType>Exe</OutputType>
<RootNamespace>SearchFiles</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags></FileUpgradeFlags>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -65,20 +58,42 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\SearchFiles\Debug\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\SearchFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</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>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\SearchFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>false</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
@@ -86,33 +101,64 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\..\bin\demo\SearchFiles\Release\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\SearchFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile>..\..\..\doc\demo\SearchFiles.xml</DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn></NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>pdbonly</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\bin\demo\SearchFiles\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<DocumentationFile>..\..\..\doc\demo\SearchFiles.xml</DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
- <NoWarn>
- </NoWarn>
+ <NoWarn></NoWarn>
<Optimize>true</Optimize>
<RegisterForComInterop>false</RegisterForComInterop>
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Data">
<Name>System.Data</Name>
</Reference>
@@ -163,9 +209,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PreBuildEvent></PreBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/Contrib.Analyzers.Test.csproj Mon Jul 16 20:36:26 2012
@@ -26,14 +26,11 @@
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{67D27628-F1D5-4499-9818-B669731925C8}</ProjectGuid>
- <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lucene.Net.Analyzers</RootNamespace>
<AssemblyName>Lucene.Net.Contrib.Analyzers.Test</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
+ <FileUpgradeFlags></FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
@@ -53,24 +50,56 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\Analyzers\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>618</NoWarn>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Analyzers\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\Analyzers\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Analyzers\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\Analyzers\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
- <DebugSymbols>false</DebugSymbols>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\Analyzers\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>618</NoWarn>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
@@ -83,6 +112,7 @@
<HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="AR\TestArabicAnalyzer.cs" />
Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenFilter.cs Mon Jul 16 20:36:26 2012
@@ -37,7 +37,7 @@ namespace Lucene.Net.Analysis.NGram
private TokenStream input;
[SetUp]
- public void SetUp()
+ public override void SetUp()
{
base.SetUp();
input = new WhitespaceTokenizer(new StringReader("abcde"));
Modified: incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Analyzers/NGram/TestNGramTokenizer.cs Mon Jul 16 20:36:26 2012
@@ -37,7 +37,7 @@ namespace Lucene.Net.Analysis.NGram
private StringReader input;
[SetUp]
- public void SetUp()
+ public override void SetUp()
{
base.SetUp();
input = new StringReader("abcde");
Modified: incubator/lucene.net/trunk/test/contrib/Core/Contrib.Core.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Core/Contrib.Core.Test.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Core/Contrib.Core.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/Core/Contrib.Core.Test.csproj Mon Jul 16 20:36:26 2012
@@ -19,7 +19,6 @@
under the License.
-->
-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,14 +26,11 @@
<ProductVersion>9.0.30729</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{A065904B-1EBA-48DA-8D3D-D92A85BA41FC}</ProjectGuid>
- <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lucene.Net.Test</RootNamespace>
<AssemblyName>Lucene.Net.Contrib.Core.Test</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
+ <FileUpgradeFlags></FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
<UpgradeBackupLocation />
<PublishUrl>publish\</PublishUrl>
@@ -54,31 +50,65 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Core\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\Core\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
- <DocumentationFile>
- </DocumentationFile>
+ <DocumentationFile></DocumentationFile>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\Core\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>618</NoWarn>
+ <DocumentationFile></DocumentationFile>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Core\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\Core\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>618</NoWarn>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\Core\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <NoWarn>618</NoWarn>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.Test.csproj Mon Jul 16 20:36:26 2012
@@ -19,7 +19,6 @@
under the License.
-->
-
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -27,16 +26,12 @@
<ProductVersion>9.0.21022</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{33ED01FD-A87C-4208-BA49-2586EFE32974}</ProjectGuid>
- <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lucene.Net.Search.Vectorhighlight</RootNamespace>
<AssemblyName>Lucene.Net.FastVectorHighlighter.Test</AssemblyName>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
+ <FileUpgradeFlags></FileUpgradeFlags>
<OldToolsVersion>3.5</OldToolsVersion>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
<InstallFrom>Disk</InstallFrom>
@@ -54,33 +49,67 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>
- </DocumentationFile>
+ <DocumentationFile></DocumentationFile>
<NoWarn>618</NoWarn>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile></DocumentationFile>
+ <NoWarn>618</NoWarn>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
- <DocumentationFile>
- </DocumentationFile>
+ <DocumentationFile></DocumentationFile>
<NoWarn>618</NoWarn>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DocumentationFile></DocumentationFile>
+ <NoWarn>618</NoWarn>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\framework\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
</ItemGroup>
<ItemGroup>
<Compile Include="AbstractTestCase.cs" />
Modified: incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/FastVectorHighlighter/Support.cs Mon Jul 16 20:36:26 2012
@@ -51,12 +51,3 @@ namespace Lucene.Net.Search.Vectorhighli
}
}
}
-
-namespace System.Runtime.CompilerServices
-{
- [AttributeUsage(AttributeTargets.Method)]
- public sealed class ExtensionAttribute : Attribute
- {
- public ExtensionAttribute() { }
- }
-}
Modified: incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/Highlighter/Contrib.Highlighter.Test.csproj Mon Jul 16 20:36:26 2012
@@ -27,27 +27,19 @@
<ProjectGuid>{31E10ECB-1385-4C06-970B-2C030FBD4893}</ProjectGuid>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ApplicationIcon>
- </ApplicationIcon>
- <AssemblyKeyContainerName>
- </AssemblyKeyContainerName>
+ <ApplicationIcon></ApplicationIcon>
+ <AssemblyKeyContainerName></AssemblyKeyContainerName>
<AssemblyName>Lucene.Net.Contrib.Highlighter.Test</AssemblyName>
- <AssemblyOriginatorKeyFile>
- </AssemblyOriginatorKeyFile>
+ <AssemblyOriginatorKeyFile></AssemblyOriginatorKeyFile>
<DefaultClientScript>JScript</DefaultClientScript>
<DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
<DefaultTargetSchema>IE50</DefaultTargetSchema>
<DelaySign>false</DelaySign>
- <OutputType>Library</OutputType>
<RootNamespace>Lucene.Net.Search.Highlight.Test</RootNamespace>
<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
- <StartupObject>
- </StartupObject>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <StartupObject></StartupObject>
+ <FileUpgradeFlags></FileUpgradeFlags>
+ <UpgradeBackupLocation></UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
<PublishUrl>publish\</PublishUrl>
<Install>true</Install>
@@ -66,15 +58,38 @@
<BootstrapperEnabled>true</BootstrapperEnabled>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\build\bin\contrib\Highlighter\Debug\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\contrib\Highlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618</NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\contrib\Highlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
@@ -86,18 +101,19 @@
<WarningLevel>4</WarningLevel>
<DebugType>full</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <OutputPath>..\..\..\build\bin\contrib\Highlighter\Release\</OutputPath>
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\contrib\Highlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<BaseAddress>285212672</BaseAddress>
<CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
- <ConfigurationOverrideFile>
- </ConfigurationOverrideFile>
- <DefineConstants>TRACE</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
- <DebugSymbols>false</DebugSymbols>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoStdLib>false</NoStdLib>
<NoWarn>618</NoWarn>
@@ -106,8 +122,32 @@
<RemoveIntegerChecks>false</RemoveIntegerChecks>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
- <DebugType>none</DebugType>
+ <DebugType>pdbonly</DebugType>
<ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <OutputPath>..\..\..\build\bin\contrib\Highlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile></ConfigurationOverrideFile>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <DocumentationFile></DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>618</NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>pdbonly</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">
@@ -116,6 +156,7 @@
<Reference Include="System">
<Name>System</Name>
</Reference>
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.XML" />
</ItemGroup>
<ItemGroup>
@@ -169,9 +210,7 @@
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
<PropertyGroup>
- <PreBuildEvent>
- </PreBuildEvent>
- <PostBuildEvent>
- </PostBuildEvent>
+ <PreBuildEvent></PreBuildEvent>
+ <PostBuildEvent></PostBuildEvent>
</PropertyGroup>
</Project>
\ No newline at end of file
Modified: incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs (original)
+++ incubator/lucene.net/trunk/test/contrib/Highlighter/HighlighterTest.cs Mon Jul 16 20:36:26 2012
@@ -1177,7 +1177,7 @@ namespace Lucene.Net.Search.Highlight.Te
helper.TestAction = () =>
{
var goodWord = "goodtoken";
- var stopWords = new HashSet<string> {"stoppedtoken"};
+ var stopWords = Support.Compatibility.SetFactory.GetSet(new[] { "stoppedtoken" });
var query = new TermQuery(new Term("data", goodWord));
@@ -1229,25 +1229,25 @@ namespace Lucene.Net.Search.Highlight.Te
{
var helper = new TestHighlightRunner();
helper.TestAction = () =>
- {
- var stopWords = new HashSet<string> {"in", "it"};
- TermQuery query = new TermQuery(new Term("text", "searchterm"));
+ {
+ var stopWords = Support.Compatibility.SetFactory.GetSet(new[] {"in", "it"});
+ TermQuery query = new TermQuery(new Term("text", "searchterm"));
- String text = "this is a text with searchterm in it";
- SimpleHTMLFormatter fm = new SimpleHTMLFormatter();
- Highlighter hg = helper.GetHighlighter(query, "text",
- new StandardAnalyzer(TEST_VERSION,
- stopWords).
- TokenStream("text",
- new StringReader(text)),
- fm);
- hg.TextFragmenter = new NullFragmenter();
- hg.MaxDocCharsToAnalyze = 36;
- String match = hg.GetBestFragment(new StandardAnalyzer(TEST_VERSION, stopWords),
- "text", text);
- Assert.IsTrue(match.EndsWith("in it"),
- "Matched text should contain remainder of text after highlighted query ");
- };
+ String text = "this is a text with searchterm in it";
+ SimpleHTMLFormatter fm = new SimpleHTMLFormatter();
+ Highlighter hg = helper.GetHighlighter(query, "text",
+ new StandardAnalyzer(TEST_VERSION,
+ stopWords).
+ TokenStream("text",
+ new StringReader(text)),
+ fm);
+ hg.TextFragmenter = new NullFragmenter();
+ hg.MaxDocCharsToAnalyze = 36;
+ String match = hg.GetBestFragment(new StandardAnalyzer(TEST_VERSION, stopWords),
+ "text", text);
+ Assert.IsTrue(match.EndsWith("in it"),
+ "Matched text should contain remainder of text after highlighted query ");
+ };
helper.Start();
}
Modified: incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj (original)
+++ incubator/lucene.net/trunk/test/contrib/Memory/Contrib.Memory.Test.csproj Mon Jul 16 20:36:26 2012
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -19,41 +19,70 @@
under the License.
-->
-
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{66C13054-FF41-4C1D-BD0D-8DA009D1DFFD}</ProjectGuid>
- <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Lucene.Net.Index.Memory.Test</RootNamespace>
<AssemblyName>Lucene.Net.Contrib.Memory.Test</AssemblyName>
- <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Memory\Debug\</OutputPath>
- <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
- <OutputPath>..\..\..\build\bin\contrib\Memory\Release\</OutputPath>
- <DefineConstants>TRACE</DefineConstants>
+ <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+ <DebugType>pdbonly</DebugType>
+ <Optimize>true</Optimize>
+ <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+ <DefineConstants>TRACE;$(Framework)</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <DebugSymbols>true</DebugSymbols>
+ <OutputType>Library</OutputType>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework">
<HintPath>..\..\..\lib\NUnit.org\NUnit\2.5.9\bin\net-2.0\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="System" />
+ <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
</Reference>
@@ -100,4 +129,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>
\ No newline at end of file