lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ccurr...@apache.org
Subject svn commit: r1362240 [4/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...
Date Mon, 16 Jul 2012 20:36:33 GMT
Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemFilter.cs Mon Jul 16 20:36:26 2012
@@ -114,7 +114,7 @@ namespace Lucene.Net.Analysis.Nl
         /**
          * Set an alternative exclusion list for this filter.
          */
-        public void SetExclusionTable(HashSet<string> exclusiontable)
+        public void SetExclusionTable(ISet<string> exclusiontable)
         {
             exclusions = exclusiontable;
         }

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Nl/DutchStemmer.cs Mon Jul 16 20:36:26 2012
@@ -67,7 +67,7 @@ namespace Lucene.Net.Analysis.Nl
                     return null;
 
             // Reset the StringBuilder.
-            sb.Clear();
+            sb.Length = 0;
             sb.Insert(0, term);
             // Stemming starts here...
             substitute(sb);
@@ -432,7 +432,7 @@ namespace Lucene.Net.Analysis.Nl
         private void reStoreYandI(StringBuilder sb)
         {
             String tmp = sb.ToString();
-            sb.Clear();
+            sb.Length = 0;
             sb.Insert(0, tmp.Replace("I", "i").Replace("Y", "y"));
         }
 

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Query/QueryAutoStopWordAnalyzer.cs Mon Jul 16 20:36:26 2012
@@ -47,7 +47,7 @@ namespace Lucene.Net.Analysis.Query
  */
 public class QueryAutoStopWordAnalyzer : Analyzer {
   Analyzer _delegate;
-  HashMap<String,HashSet<String>> stopWordsPerField = new HashMap<String,HashSet<String>>();
+  HashMap<String,ISet<String>> stopWordsPerField = new HashMap<String,ISet<String>>();
   //The default maximum percentage (40%) of index documents which
   //can contain a term, after which the term is considered to be a stop word.
   public const float defaultMaxDocFreqPercent = 0.4f;
@@ -149,7 +149,7 @@ public class QueryAutoStopWordAnalyzer :
    */
   public int AddStopWords(IndexReader reader, String fieldName, int maxDocFreq) 
   {
-    HashSet<String> stopWords = new HashSet<String>();
+      var stopWords = Support.Compatibility.SetFactory.GetSet<string>();
     String internedFieldName = StringHelper.Intern(fieldName);
     TermEnum te = reader.Terms(new Term(fieldName));
     Term term = te.Term;
@@ -184,7 +184,7 @@ public class QueryAutoStopWordAnalyzer :
     } catch (IOException) {
       result = _delegate.TokenStream(fieldName, reader);
     }
-    HashSet<String> stopWords = stopWordsPerField[fieldName];
+    var stopWords = stopWordsPerField[fieldName];
     if (stopWords != null) {
       result = new StopFilter(StopFilter.GetEnablePositionIncrementsVersionDefault(matchVersion),
                               result, stopWords);
@@ -227,7 +227,7 @@ public class QueryAutoStopWordAnalyzer :
       streams.Wrapped = _delegate.ReusableTokenStream(fieldName, reader);
 
       /* if there are any stopwords for the field, save the stopfilter */
-      HashSet<String> stopWords = stopWordsPerField[fieldName];
+      var stopWords = stopWordsPerField[fieldName];
       if (stopWords != null)
         streams.WithStopFilter = new StopFilter(StopFilter.GetEnablePositionIncrementsVersionDefault(matchVersion),
                                                 streams.Wrapped, stopWords);
@@ -249,7 +249,7 @@ public class QueryAutoStopWordAnalyzer :
          * field, create a new StopFilter around the new stream
          */
         streams.Wrapped = result;
-        HashSet<String> stopWords = stopWordsPerField[fieldName];
+        var stopWords = stopWordsPerField[fieldName];
         if (stopWords != null)
           streams.WithStopFilter = new StopFilter(StopFilter.GetEnablePositionIncrementsVersionDefault(matchVersion),
                                                   streams.Wrapped, stopWords);
@@ -270,7 +270,7 @@ public class QueryAutoStopWordAnalyzer :
    */
   public String[] GetStopWords(String fieldName) {
     String[] result;
-    HashSet<String> stopWords = stopWordsPerField[fieldName];
+    var stopWords = stopWordsPerField[fieldName];
     if (stopWords != null) {
       result = stopWords.ToArray();
     } else {
@@ -288,7 +288,7 @@ public class QueryAutoStopWordAnalyzer :
     List<Term> allStopWords = new List<Term>();
     foreach(var fieldName in stopWordsPerField.Keys) 
     {
-      HashSet<String> stopWords = stopWordsPerField[fieldName];
+      var stopWords = stopWordsPerField[fieldName];
       foreach(var text in stopWords) {
         allStopWords.Add(new Term(fieldName, text));
       }

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianAnalyzer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianAnalyzer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianAnalyzer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Ru/RussianAnalyzer.cs Mon Jul 16 20:36:26 2012
@@ -65,7 +65,7 @@ namespace Lucene.Net.Analysis.Ru
 
         private static class DefaultSetHolder
         {
-            internal static readonly ISet<string> DEFAULT_STOP_SET = CharArraySet.UnmodifiableSet(new CharArraySet(RUSSIAN_STOP_WORDS, false));
+            internal static readonly ISet<string> DEFAULT_STOP_SET = CharArraySet.UnmodifiableSet(new CharArraySet((IEnumerable<string>)RUSSIAN_STOP_WORDS, false));
         }
 
         /// <summary>

Modified: incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Analyzers/Shingle/ShingleFilter.cs Mon Jul 16 20:36:26 2012
@@ -157,7 +157,7 @@ namespace Lucene.Net.Analysis.Shingle
         {
             for (int i = 0; i < shingles.Length; i++)
             {
-                shingles[i].Clear();
+                shingles[i].Length = 0;
             }
         }
 

Modified: incubator/lucene.net/trunk/src/contrib/Core/Contrib.Core.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Core/Contrib.Core.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Core/Contrib.Core.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Core/Contrib.Core.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>{FEF899EB-610C-4D3C-A556-A01F56F4AFE0}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lucene.Net</RootNamespace>
     <AssemblyName>Lucene.Net.Contrib.Core</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <PublishUrl>publish\</PublishUrl>
@@ -54,24 +50,58 @@
     <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>
+    <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>
+    <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>
-    <DocumentationFile>..\..\..\build\bin\contrib\Core\Release\Lucene.Net.Contrib.Core.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\bin\contrib\Core\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Core.XML</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\Core\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\bin\contrib\Core\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Core.XML</DocumentationFile>
+    <NoWarn>618</NoWarn>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -81,6 +111,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Analysis\Ext\Analysis.Ext.cs" />

Modified: incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/FastVectorHighlighter/Contrib.FastVectorHighlighter.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>{9D2E3153-076F-49C5-B83D-FB2573536B5F}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lucene.Net.Search.Vectorhighlight</RootNamespace>
     <AssemblyName>Lucene.Net.FastVectorHighlighter</AssemblyName>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
+    <UpgradeBackupLocation></UpgradeBackupLocation>
     <IsWebBootstrapper>false</IsWebBootstrapper>
     <PublishUrl>publish\</PublishUrl>
     <Install>true</Install>
@@ -54,26 +49,60 @@
     <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>TRACE;DEBUG;LUCENENET_350</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;LUCENENET_350;$(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>TRACE;DEBUG;LUCENENET_350;$(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;LUCENENET_350</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;LUCENENET_350;$(Framework)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\bin\contrib\FastVectorHighlighter\Release\Lucene.Net.FastVectorHighlighter.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.FastVectorHighlighter.XML</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;LUCENENET_350;$(Framework)</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\bin\contrib\FastVectorHighlighter\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.FastVectorHighlighter.XML</DocumentationFile>
+    <NoWarn>618</NoWarn>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -83,6 +112,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BaseFragmentsBuilder.cs" />

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/Contrib.Highlighter.csproj Mon Jul 16 20:36:26 2012
@@ -27,26 +27,19 @@
     <ProjectGuid>{901D5415-383C-4AA6-A256-879558841BEA}</ProjectGuid>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>
-    </ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
+    <ApplicationIcon></ApplicationIcon>
+    <AssemblyKeyContainerName></AssemblyKeyContainerName>
     <AssemblyName>Lucene.Net.Contrib.Highlighter</AssemblyName>
     <AssemblyOriginatorKeyFile>Lucene.Net.snk</AssemblyOriginatorKeyFile>
     <DefaultClientScript>JScript</DefaultClientScript>
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
     <RootNamespace>Lucene.Net.Search.Highlight</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,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>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>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>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>
@@ -85,17 +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>..\..\..build\bin\contrib\Highlighter\Release\Lucene.Net.Contrib.Highlighter.XML</DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
+    <ConfigurationOverrideFile></ConfigurationOverrideFile>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..build\bin\contrib\Highlighter\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Highlighter.XML</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
     <NoWarn>618</NoWarn>
@@ -104,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>..\..\..build\bin\contrib\Highlighter\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Highlighter.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>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -114,6 +156,7 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">
@@ -217,9 +260,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/contrib/Highlighter/QueryScorer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryScorer.cs Mon Jul 16 20:36:26 2012
@@ -20,6 +20,7 @@ using System.Collections.Generic;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
 using Lucene.Net.Index;
+using Lucene.Net.Index.Memory;
 using Lucene.Net.Search.Spans;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
@@ -240,7 +241,7 @@ namespace Lucene.Net.Search.Highlight
         /// <seealso cref="IScorer.StartFragment"/>
         public void StartFragment(TextFragment newFragment)
         {
-            foundTerms = new HashSet<String>();
+            foundTerms = Support.Compatibility.SetFactory.GetSet<string>();
             totalScore = 0;
         }
 

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermExtractor.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermExtractor.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermExtractor.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/QueryTermExtractor.cs Mon Jul 16 20:36:26 2012
@@ -119,7 +119,7 @@ namespace Lucene.Net.Search.Highlight
                     GetTermsFromFilteredQuery((FilteredQuery) query, terms, prohibited, fieldName);
                 else
                 {
-                    HashSet<Term> nonWeightedTerms = new HashSet<Term>();
+                    var nonWeightedTerms = Support.Compatibility.SetFactory.GetSet<Term>();
                     query.ExtractTerms(nonWeightedTerms);
                     foreach (var term in nonWeightedTerms)
                     {

Modified: incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Highlighter/WeightedSpanTermExtractor.cs Mon Jul 16 20:36:26 2012
@@ -259,7 +259,7 @@ namespace Lucene.Net.Search.Highlight
 
             IDictionary<String, SpanQuery> queries = new HashMap<String, SpanQuery>();
 
-            HashSet<Term> nonWeightedTerms = new HashSet<Term>();
+            var nonWeightedTerms = Support.Compatibility.SetFactory.GetSet<Term>();
             bool mustRewriteQuery = MustRewriteQuery(spanQuery);
             if (mustRewriteQuery)
             {
@@ -338,7 +338,7 @@ namespace Lucene.Net.Search.Highlight
         /// <param name="query"></param>
         private void ExtractWeightedTerms(IDictionary<String, WeightedSpanTerm> terms, Query query)
         {
-            HashSet<Term> nonWeightedTerms = new HashSet<Term>();
+            var nonWeightedTerms = Support.Compatibility.SetFactory.GetSet<Term>();
             query.ExtractTerms(nonWeightedTerms);
 
             foreach (Term queryTerm in nonWeightedTerms)

Modified: incubator/lucene.net/trunk/src/contrib/Memory/CollectionsHelper.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/CollectionsHelper.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/CollectionsHelper.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/CollectionsHelper.cs Mon Jul 16 20:36:26 2012
@@ -24,7 +24,6 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Index.Memory
 {

Modified: incubator/lucene.net/trunk/src/contrib/Memory/Contrib.Memory.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/Contrib.Memory.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/Contrib.Memory.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/Contrib.Memory.csproj Mon Jul 16 20:36:26 2012
@@ -25,31 +25,61 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{112B9A7C-29CC-4539-8F5A-45669C07CD4D}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lucene.Net.Index.Memory</RootNamespace>
     <AssemblyName>Lucene.Net.Contrib.Memory</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\bin\contrib\Memory\Debug\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <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>
+    <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\bin\contrib\Memory\Release\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Memory.XML</DocumentationFile>
+    <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>
+    <OutputPath>..\..\..\build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>..\..\..build\bin\contrib\Memory\Release\Lucene.Net.Contrib.Memory.XML</DocumentationFile>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..build\bin\contrib\Memory\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Memory.XML</DocumentationFile>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -59,10 +89,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.CSharp" Condition="'$(Framework)' != 'NET35'" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>

Modified: incubator/lucene.net/trunk/src/contrib/Memory/EmptyCollector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/EmptyCollector.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/EmptyCollector.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/EmptyCollector.cs Mon Jul 16 20:36:26 2012
@@ -23,7 +23,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Lucene.Net.Search;
 
 namespace Lucene.Net.Index.Memory

Modified: incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/KeywordTokenStream.cs Mon Jul 16 20:36:26 2012
@@ -23,7 +23,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Tokenattributes;
 

Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermEnum.cs Mon Jul 16 20:36:26 2012
@@ -23,7 +23,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Index.Memory
 {

Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositionVector.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositionVector.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositionVector.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositionVector.cs Mon Jul 16 20:36:26 2012
@@ -23,7 +23,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Index.Memory
 {

Modified: incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/MemoryTermPositions.cs Mon Jul 16 20:36:26 2012
@@ -23,7 +23,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Index.Memory
 {

Modified: incubator/lucene.net/trunk/src/contrib/Memory/TermComparer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Memory/TermComparer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Memory/TermComparer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Memory/TermComparer.cs Mon Jul 16 20:36:26 2012
@@ -23,7 +23,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
 
 namespace Lucene.Net.Index.Memory
 {

Modified: incubator/lucene.net/trunk/src/contrib/Queries/Contrib.Queries.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Contrib.Queries.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Contrib.Queries.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Contrib.Queries.csproj Mon Jul 16 20:36:26 2012
@@ -26,14 +26,11 @@
     <ProductVersion>9.0.21022</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{481CF6E3-52AF-4621-9DEB-022122079AF6}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lucene.Net.Search</RootNamespace>
     <AssemblyName>Lucene.Net.Contrib.Queries</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>3.5</OldToolsVersion>
     <UpgradeBackupLocation />
     <PublishUrl>publish\</PublishUrl>
@@ -53,24 +50,58 @@
     <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\Queries\$(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\Queries\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\Queries\$(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' ">
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
-    <OutputPath>..\..\..\build\bin\contrib\Queries\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\Queries\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
-    <DocumentationFile>..\..\..\build\bin\contrib\Queries\Release\Lucene.Net.Contrib.Queries.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\bin\contrib\Queries\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Queries.XML</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\Queries\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <DocumentationFile>..\..\..\build\bin\contrib\Queries\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Queries.XML</DocumentationFile>
+    <NoWarn>618</NoWarn>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -80,6 +111,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BooleanFilter.cs" />

Modified: incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Queries/Similar/SimilarityQueries.cs Mon Jul 16 20:36:26 2012
@@ -90,7 +90,7 @@ namespace Similarity.Net
             ITermAttribute termAtt = ts.AddAttribute<ITermAttribute>();
 
             BooleanQuery tmp = new BooleanQuery();
-            ISet<string> already = new HashSet<string>(); // ignore dups
+            ISet<string> already = Lucene.Net.Support.Compatibility.SetFactory.GetSet<string>(); // ignore dups
             while (ts.IncrementToken())
             {
                 String word = termAtt.Term;

Modified: incubator/lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Regex/Contrib.Regex.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Regex/Contrib.Regex.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,32 +26,64 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{A26BD3B7-DF90-43B4-99E2-6A617CDE1579}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Contrib.Regex</RootNamespace>
     <AssemblyName>Contrib.Regex</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\Regex\$(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\Regex\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\Regex\$(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' ">
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\bin\contrib\Regex\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>618</NoWarn>
+    <DocumentationFile>..\..\..\build\bin\contrib\Regex\$(Configuration.Replace("35", ""))\$(Framework)\Contrib.Regex.XML</DocumentationFile>
+    <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\Regex\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\Regex\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>618</NoWarn>
-    <DocumentationFile>..\..\..\build\bin\contrib\Regex\Release\Contrib.Regex.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\bin\contrib\Regex\$(Configuration.Replace("35", ""))\$(Framework)\Contrib.Regex.XML</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -62,6 +93,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="CSharpRegexCapabilities.cs" />

Modified: incubator/lucene.net/trunk/src/contrib/Similarity/Contrib.Similarity.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Similarity/Contrib.Similarity.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Similarity/Contrib.Similarity.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Similarity/Contrib.Similarity.csproj Mon Jul 16 20:36:26 2012
@@ -19,7 +19,6 @@
  under the License.
 
 -->
-
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
@@ -36,13 +35,10 @@
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
     <RootNamespace>SimilarityNet</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject />
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>0.0</OldToolsVersion>
     <UpgradeBackupLocation />
     <PublishUrl>publish\</PublishUrl>
@@ -62,13 +58,15 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\bin\contrib\Similarity\Debug\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Similarity\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile />
-    <DefineConstants />
-    <DocumentationFile />
+    <DefineConstants>;$(Framework)</DefineConstants>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
@@ -80,15 +78,18 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\bin\contrib\Similarity\Release\</OutputPath>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug35|AnyCPU' ">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Similarity\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile />
-    <DefineConstants />
-    <DocumentationFile>..\..\..\build\bin\contrib\Similarity\Release\Lucene.Net.Contrib.Similarity.XML</DocumentationFile>
+    <DefineConstants>;$(Framework)</DefineConstants>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
@@ -100,6 +101,53 @@
     <WarningLevel>4</WarningLevel>
     <DebugType>full</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Similarity\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile />
+    <DefineConstants>;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..\build\bin\contrib\Similarity\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Similarity.XML</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>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\Similarity\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile />
+    <DefineConstants>;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..\build\bin\contrib\Similarity\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Similarity.XML</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>pdbonly</DebugType>
+    <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -108,6 +156,7 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">

Modified: incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/Extensions.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/Extensions.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/Extensions.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/Extensions.cs Mon Jul 16 20:36:26 2012
@@ -25,6 +25,22 @@ namespace Lucene.Net.Search
     public static class Extensions
     {
         //CartesianProduct - Lambda
+        public static IEnumerable<IEnumerable<T>> CartesianProduct<T>(this IEnumerable<IList<T>> sequences)
+        {
+            IEnumerable<IEnumerable<T>> emptyProduct = new IEnumerable<T>[] { Enumerable.Empty<T>() };
+            return sequences.Aggregate(
+                emptyProduct,
+                (accumulator, sequence) =>
+                {
+                    return accumulator.SelectMany(
+                        (accseq => sequence),
+                        (accseq, item) => accseq.Concat(new T[] { item })
+                    );
+                }
+            );
+        }
+
+        //CartesianProduct - Lambda
         public static IEnumerable<IEnumerable<T>> CartesianProduct<T>(this IEnumerable<IEnumerable<T>> sequences)
         {
             IEnumerable<IEnumerable<T>> emptyProduct = new IEnumerable<T>[] { Enumerable.Empty<T>() };

Modified: incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.cs Mon Jul 16 20:36:26 2012
@@ -19,7 +19,6 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-
 using Lucene.Net.Analysis;
 using Lucene.Net.Documents;
 using Lucene.Net.Analysis.Standard;
@@ -29,7 +28,10 @@ using Lucene.Net.QueryParsers;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
 using System.Threading;
+
+#if !NET35
 using System.Threading.Tasks;
+#endif
 
 /*
  Suppose, we want a faceted search on fields f1 f2 f3, 
@@ -80,7 +82,7 @@ namespace Lucene.Net.Search
             //f2 = I, J
             //f3 = 1, 2, 3
             int maxFacets = 1;
-            List<List<string>> inputToCP = new List<List<string>>();
+            IList<IList<string>> inputToCP = new List<IList<string>>();
             foreach (string field in groupByFields)
             {
                 FieldValuesBitSets f = new FieldValuesBitSets(reader, field);
@@ -100,11 +102,14 @@ namespace Lucene.Net.Search
             //BitSet1: A AND I AND 1
             //BitSet2: A AND I AND 2 etc.
             //and remove impossible comb's (for ex, B J 3) from list.
+#if !NET35
             Parallel.ForEach(cp, combinations =>
+#else
+            foreach(var combinations in cp)
+#endif
             {
                 OpenBitSetDISI bitSet = new OpenBitSetDISI(_Reader.MaxDoc);
                 bitSet.Set(0, bitSet.Size());
-
                 List<string> comb = combinations.ToList();
 
                 for (int j = 0; j < comb.Count; j++)
@@ -118,28 +123,41 @@ namespace Lucene.Net.Search
                     lock(_Groups)
                         _Groups.Add(new KeyValuePair<List<string>, OpenBitSetDISI>(comb, bitSet));
                 }
-            });
+            }
+#if !NET35
+            );
+#endif
+
 
             //Now _Groups has 7 rows (as <List<string>, BitSet> pairs) 
         }
         
-        public Hits Search(Query query, int maxDocPerGroup = DefaultMaxDocPerGroup)
+        public Hits Search(Query query)
+        {
+            return Search(query, DefaultMaxDocPerGroup);
+        }
+
+        public Hits Search(Query query, int maxDocPerGroup)
         {
-            List<HitsPerFacet> hitsPerGroup = new List<HitsPerFacet>();
+            var hitsPerGroup = new List<HitsPerFacet>();
 
             DocIdSet queryDocidSet = new CachingWrapperFilter(new QueryWrapperFilter(query)).GetDocIdSet(_Reader);
-            Action[] actions = new Action[_Groups.Count];           
+            var actions = new Action[_Groups.Count];           
             for (int i = 0; i < _Groups.Count; i++)
             {
-                HitsPerFacet h = new HitsPerFacet(new FacetName(_Groups[i].Key.ToArray()), _Reader, queryDocidSet, _Groups[i].Value, maxDocPerGroup);
+                var h = new HitsPerFacet(new FacetName(_Groups[i].Key.ToArray()), _Reader, queryDocidSet, _Groups[i].Value, maxDocPerGroup);
                 hitsPerGroup.Add(h);
-                actions[i] = () => h.Calculate();
+                actions[i] = h.Calculate;
             }
             
+#if !NET35
             Parallel.Invoke(actions);
+#else
+            foreach (var action in actions)
+                action();
+#endif
             
-            Hits hits = new Hits();
-            hits.HitsPerFacet = hitsPerGroup.ToArray();
+            Hits hits = new Hits {HitsPerFacet = hitsPerGroup.ToArray()};
 
             return hits;
         }

Modified: incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/SimpleFacetedSearch/SimpleFacetedSearch.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,32 +26,64 @@
     <ProductVersion>8.0.30703</ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectGuid>{66772190-FB3F-48F5-8E05-0B302BACEA73}</ProjectGuid>
-    <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Lucene.Net.Search.SimpleFacetedSearch</RootNamespace>
     <AssemblyName>Lucene.Net.Search.SimpleFacetedSearch</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\SimpleFacetedSearch\$(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\SimpleFacetedSearch\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(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' ">
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <NoWarn>618</NoWarn>
+    <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Search.SimpleFacetedSearch.XML</DocumentationFile>
+    <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\SimpleFacetedSearch\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <OutputPath>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <NoWarn>618</NoWarn>
-    <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\Release\Lucene.Net.Search.SimpleFacetedSearch.XML</DocumentationFile>
+    <DocumentationFile>..\..\..\build\bin\contrib\SimpleFacetedSearch\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Search.SimpleFacetedSearch.XML</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -62,10 +93,11 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="System" />
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.CSharp" Condition="'$(Framework)' != 'NET35'" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/Contrib.Snowball.csproj Mon Jul 16 20:36:26 2012
@@ -19,7 +19,6 @@
  under the License.
 
 -->
-
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Build">
   <PropertyGroup>
     <ProjectType>Local</ProjectType>
@@ -36,13 +35,10 @@
     <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
     <DefaultTargetSchema>IE50</DefaultTargetSchema>
     <DelaySign>false</DelaySign>
-    <OutputType>Library</OutputType>
     <RootNamespace>Snowball.Net</RootNamespace>
     <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
     <StartupObject />
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <FileUpgradeFlags></FileUpgradeFlags>
     <OldToolsVersion>0.0</OldToolsVersion>
     <UpgradeBackupLocation />
     <PublishUrl>publish\</PublishUrl>
@@ -62,13 +58,15 @@
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>..\..\..\build\bin\contrib\Snowball\Debug\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Snowball\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile />
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile />
+    <DefineConstants>DEBUG;TRACE;$(Framework)</DefineConstants>
+    <DocumentationFile></DocumentationFile>
     <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
@@ -80,16 +78,65 @@
     <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\Snowball\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <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)' == 'Release|AnyCPU' ">
-    <OutputPath>..\..\..\build\bin\contrib\Snowball\Release\</OutputPath>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Snowball\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
+    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+    <BaseAddress>285212672</BaseAddress>
+    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+    <ConfigurationOverrideFile />
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..\build\bin\contrib\Snowball\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Snowball.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>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release35|AnyCPU' ">
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <Framework>$(TargetFrameworkVersion.Replace("v", "NET").Replace(".", ""))</Framework>
+    <OutputPath>..\..\..\build\bin\contrib\Snowball\$(Configuration.Replace("35", ""))\$(Framework)\</OutputPath>
     <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
     <BaseAddress>285212672</BaseAddress>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <ConfigurationOverrideFile />
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>..\..\..\build\bin\contrib\Snowball\Release\Lucene.Net.Contrib.Snowball.XML</DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
+    <DefineConstants>TRACE;$(Framework)</DefineConstants>
+    <DocumentationFile>..\..\..\build\bin\contrib\Snowball\$(Configuration.Replace("35", ""))\$(Framework)\Lucene.Net.Contrib.Snowball.XML</DocumentationFile>
+    <DebugSymbols>true</DebugSymbols>
     <FileAlignment>4096</FileAlignment>
     <NoStdLib>false</NoStdLib>
     <NoWarn>618</NoWarn>
@@ -98,8 +145,9 @@
     <RemoveIntegerChecks>false</RemoveIntegerChecks>
     <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
+    <DebugType>pdbonly</DebugType>
     <ErrorReport>prompt</ErrorReport>
+    <OutputType>Library</OutputType>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -108,6 +156,7 @@
     <Reference Include="System">
       <Name>System</Name>
     </Reference>
+    <Reference Condition="'$(Framework)' == 'NET35'" Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.cs">

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DanishStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DanishStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DanishStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DanishStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,7 +21,8 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
+#pragma warning disable 162,164
+
 	/// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class DanishStemmer : SnowballProgram
 	{

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DutchStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DutchStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DutchStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/DutchStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162
+    
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class DutchStemmer : SnowballProgram
 	{
 		public DutchStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/EnglishStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/EnglishStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/EnglishStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/EnglishStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,6 +21,8 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
+#pragma warning disable 162,164
+
     /// <summary> Generated class implementing code defined by a snowball script.</summary>
     public class EnglishStemmer : SnowballProgram
     {

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FinnishStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FinnishStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FinnishStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FinnishStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,7 +21,8 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
+#pragma warning disable 162,164
+
 	/// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class FinnishStemmer:SnowballProgram
 	{

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FrenchStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FrenchStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FrenchStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/FrenchStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class FrenchStemmer : SnowballProgram
 	{
 		public FrenchStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/German2Stemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/German2Stemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/German2Stemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/German2Stemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class German2Stemmer : SnowballProgram
 	{
 		public German2Stemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/GermanStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/GermanStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/GermanStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/GermanStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162
+    
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class GermanStemmer : SnowballProgram
 	{
 		public GermanStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/ItalianStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/ItalianStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/ItalianStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/ItalianStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+    
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class ItalianStemmer : SnowballProgram
 	{
 		public ItalianStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/KpStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/KpStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/KpStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/KpStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class KpStemmer : SnowballProgram
 	{
 		public KpStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/LovinsStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/LovinsStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/LovinsStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/LovinsStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+    
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class LovinsStemmer : SnowballProgram
 	{
 		public LovinsStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/NorwegianStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/NorwegianStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/NorwegianStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/NorwegianStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,7 +21,8 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
+#pragma warning disable 162,164
+
 	/// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class NorwegianStemmer : SnowballProgram
 	{

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/PorterStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/PorterStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/PorterStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/PorterStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class PorterStemmer : SnowballProgram
 	{
 		public PorterStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/RussianStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/RussianStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/RussianStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/RussianStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162,164
+    
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class RussianStemmer : SnowballProgram
 	{
 		public RussianStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SpanishStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SpanishStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SpanishStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SpanishStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,8 +21,9 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
-	/// <summary> Generated class implementing code defined by a snowball script.</summary>
+#pragma warning disable 162
+
+    /// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class SpanishStemmer : SnowballProgram
 	{
 		public SpanishStemmer()

Modified: incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SwedishStemmer.cs
URL: http://svn.apache.org/viewvc/incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SwedishStemmer.cs?rev=1362240&r1=1362239&r2=1362240&view=diff
==============================================================================
--- incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SwedishStemmer.cs (original)
+++ incubator/lucene.net/trunk/src/contrib/Snowball/SF/Snowball/Ext/SwedishStemmer.cs Mon Jul 16 20:36:26 2012
@@ -21,7 +21,8 @@ using Among = SF.Snowball.Among;
 using SnowballProgram = SF.Snowball.SnowballProgram;
 namespace SF.Snowball.Ext
 {
-	
+#pragma warning disable 162,164
+
 	/// <summary> Generated class implementing code defined by a snowball script.</summary>
 	public class SwedishStemmer : SnowballProgram
 	{



Mime
View raw message