You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by ni...@apache.org on 2020/02/03 16:38:56 UTC
[lucenenet] 01/08: SWEEP: Moved AssemblyKeys to Lucene.Net and
enabled InternalsVisibleTo for all modules. This makes it possible to make
all types in Lucene.Net.Support internal.
This is an automated email from the ASF dual-hosted git repository.
nightowl888 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit ab716562f7b6ac30c1c5f2aec0d65e0800d96fea
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Mon Feb 3 20:08:02 2020 +0700
SWEEP: Moved AssemblyKeys to Lucene.Net and enabled InternalsVisibleTo for all modules. This makes it possible to make all types in Lucene.Net.Support internal.
---
src/CommonAssemblyKeys.cs | 32 ----------------------
.../Analysis/Ar/ArabicAnalyzer.cs | 2 +-
.../Analysis/Bg/BulgarianAnalyzer.cs | 2 +-
.../Analysis/Br/BrazilianAnalyzer.cs | 2 +-
.../Analysis/Ca/CatalanAnalyzer.cs | 2 +-
.../Analysis/Cjk/CJKAnalyzer.cs | 2 +-
.../Analysis/Ckb/SoraniAnalyzer.cs | 2 +-
.../Analysis/Cn/ChineseAnalyzer.cs | 2 +-
.../Analysis/Core/KeywordAnalyzer.cs | 2 +-
.../Analysis/Core/SimpleAnalyzer.cs | 2 +-
.../Analysis/Core/StopAnalyzer.cs | 2 +-
.../Analysis/Core/WhitespaceAnalyzer.cs | 2 +-
.../Analysis/Cz/CzechAnalyzer.cs | 2 +-
.../Analysis/Da/DanishAnalyzer.cs | 2 +-
.../Analysis/De/GermanAnalyzer.cs | 2 +-
.../Analysis/El/GreekAnalyzer.cs | 2 +-
.../Analysis/En/EnglishAnalyzer.cs | 2 +-
.../Analysis/Es/SpanishAnalyzer.cs | 2 +-
.../Analysis/Eu/BasqueAnalyzer.cs | 2 +-
.../Analysis/Fa/PersianAnalyzer.cs | 4 +--
.../Analysis/Fi/FinnishAnalyzer.cs | 2 +-
.../Analysis/Fr/FrenchAnalyzer.cs | 2 +-
.../Analysis/Ga/IrishAnalyzer.cs | 2 +-
.../Analysis/Gl/GalicianAnalyzer.cs | 2 +-
.../Analysis/Hi/HindiAnalyzer.cs | 2 +-
.../Analysis/Hu/HungarianAnalyzer.cs | 2 +-
.../Analysis/Hy/ArmenianAnalyzer.cs | 2 +-
.../Analysis/Id/IndonesianAnalyzer.cs | 2 +-
.../Analysis/It/ItalianAnalyzer.cs | 2 +-
.../Analysis/Lv/LatvianAnalyzer.cs | 2 +-
.../Analysis/Miscellaneous/PatternAnalyzer.cs | 2 +-
.../Analysis/Nl/DutchAnalyzer.cs | 2 +-
.../Analysis/No/NorwegianAnalyzer.cs | 2 +-
.../Analysis/Pt/PortugueseAnalyzer.cs | 2 +-
.../Analysis/Ro/RomanianAnalyzer.cs | 2 +-
.../Analysis/Ru/RussianAnalyzer.cs | 2 +-
.../Analysis/Snowball/SnowballAnalyzer.cs | 2 +-
.../Analysis/Standard/ClassicAnalyzer.cs | 4 +--
.../Analysis/Standard/StandardAnalyzer.cs | 4 +--
.../Analysis/Standard/UAX29URLEmailAnalyzer.cs | 4 +--
.../Analysis/Sv/SwedishAnalyzer.cs | 2 +-
.../Analysis/Synonym/FSTSynonymFilterFactory.cs | 2 +-
.../Analysis/Th/ThaiAnalyzer.cs | 2 +-
.../Analysis/Tr/TurkishAnalyzer.cs | 2 +-
.../Lucene.Net.Analysis.Common.csproj | 1 -
.../Properties/AssemblyInfo.cs | 2 +-
.../Collation/ICUCollationKeyAnalyzer.cs | 2 +-
.../JapaneseAnalyzer.cs | 2 +-
.../Lucene.Net.Analysis.Kuromoji.csproj | 1 -
.../Properties/AssemblyInfo.cs | 2 +-
.../Lucene.Net.Analysis.Morfologik.csproj | 12 +++++---
.../Morfologik/MorfologikAnalyzer.cs | 2 +-
.../Properties/AssemblyInfo.cs | 12 ++------
.../Uk/UkrainianMorfologikAnalyzer.cs | 4 +--
.../Lucene.Net.Analysis.OpenNLP.csproj | 4 ---
.../Properties/AssemblyInfo.cs | 12 ++------
.../Lucene.Net.Analysis.Phonetic.csproj | 1 -
.../Properties/AssemblyInfo.cs | 2 +-
.../SmartChineseAnalyzer.cs | 2 +-
.../Lucene.Net.Analysis.Stempel.csproj | 1 -
.../Pl/PolishAnalyzer.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../ByTask/Utils/AnalyzerFactory.cs | 4 +--
.../Lucene.Net.Benchmark.csproj | 4 ---
.../Properties/AssemblyInfo.cs | 2 +-
.../Quality/Utils/QualityQueriesFinder.cs | 2 +-
src/Lucene.Net.Demo/Lucene.Net.Demo.csproj | 4 ---
src/Lucene.Net.Demo/Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Facet/Lucene.Net.Facet.csproj | 4 ---
src/Lucene.Net.Facet/Properties/AssemblyInfo.cs | 2 +-
.../AbstractGroupFacetCollector.cs | 2 +-
src/Lucene.Net.Grouping/BlockGroupingCollector.cs | 2 +-
.../Highlight/Highlighter.cs | 2 +-
.../Lucene.Net.Highlighter.csproj | 4 ---
.../Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Join/Lucene.Net.Join.csproj | 4 ---
src/Lucene.Net.Join/Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Memory/Lucene.Net.Memory.csproj | 4 ---
.../MemoryIndex.MemoryIndexReader.cs | 2 +-
src/Lucene.Net.Memory/Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Misc/Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs | 2 +-
.../Lucene.Net.QueryParser.csproj | 4 ---
.../Properties/AssemblyInfo.cs | 2 +-
.../Queries/FuzzyLikeThisQuery.cs | 2 +-
src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj | 4 ---
src/Lucene.Net.Spatial/Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj | 4 ---
src/Lucene.Net.Suggest/Properties/AssemblyInfo.cs | 2 +-
src/Lucene.Net.Suggest/Spell/SuggestWordQueue.cs | 2 +-
src/Lucene.Net.Suggest/Suggest/Lookup.cs | 2 +-
.../Properties/AssemblyInfo.cs | 2 +-
.../Support/ApiScanTestBase.cs | 4 +++
src/Lucene.Net/Codecs/BlockTreeTermsReader.cs | 6 ++--
.../Codecs/Lucene45/Lucene45DocValuesConsumer.cs | 2 +-
.../Codecs/Lucene45/Lucene45DocValuesProducer.cs | 6 ++--
src/Lucene.Net/Lucene.Net.csproj | 11 ++++++--
src/Lucene.Net/Properties/AssemblyInfo.cs | 27 ++++++++++++++++--
.../Properties/AssemblyKeys.cs} | 24 ++++++----------
src/Lucene.Net/Util/PriorityQueue.cs | 2 +-
.../Lucene.Net.ICU/Properties/AssemblyInfo.cs | 2 +-
101 files changed, 149 insertions(+), 207 deletions(-)
diff --git a/src/CommonAssemblyKeys.cs b/src/CommonAssemblyKeys.cs
deleted file mode 100644
index 90e787a..0000000
--- a/src/CommonAssemblyKeys.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-using System.Reflection;
-
-namespace Lucene.Net.Support
-{
- internal static class AssemblyKeys
- {
- public const string PublicKey =
- "002400000480000094000000060200000024000052534131000400000100010075a07ce602f88e" +
- "f263c7db8cb342c58ebd49ecdcc210fac874260b0213fb929ac3dcaf4f5b39744b800f99073eca" +
- "72aebfac5f7284e1d5f2c82012a804a140f06d7d043d83e830cdb606a04da2ad5374cc92c0a495" +
- "08437802fb4f8fb80a05e59f80afb99f4ccd0dfe44065743543c4b053b669509d29d332cd32a0c" +
- "b1e97e84";
- }
-}
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs
index bd1e1ca..02c78bd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs
@@ -135,7 +135,7 @@ namespace Lucene.Net.Analysis.Ar
/// <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="ArabicNormalizationFilter"/>, <see cref="SetKeywordMarkerFilter"/>
/// if a stem exclusion set is provided and <see cref="ArabicStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
Tokenizer source = m_matchVersion.OnOrAfter(LuceneVersion.LUCENE_31)
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs
index 1acd866..d9fffb9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Analysis.Bg
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="BulgarianStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs
index a678a5a..5aae3e4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs
@@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis.Br
/// built from a <see cref="StandardTokenizer"/> filtered with
/// <see cref="LowerCaseFilter"/>, <see cref="StandardFilter"/>, <see cref="StopFilter"/>,
/// and <see cref="BrazilianStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new LowerCaseFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs
index 75dbe60..555015c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs
@@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis.Ca
/// <see cref="StandardFilter"/>, <see cref="ElisionFilter"/>, <see cref="LowerCaseFilter"/>,
/// <see cref="StopFilter"/>, <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs
index 08d7050..fe3d069 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs
@@ -90,7 +90,7 @@ namespace Lucene.Net.Analysis.Cjk
{
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
if (m_matchVersion.OnOrAfter(LuceneVersion.LUCENE_36))
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs
index a109709..d7798e3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Analysis.Ckb
/// <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SoraniStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs
index 6105ec8..3ef52da 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs
@@ -37,7 +37,7 @@ namespace Lucene.Net.Analysis.Cn
/// <returns> <see cref="TokenStreamComponents"/>
/// built from a <see cref="ChineseTokenizer"/> filtered with
/// <see cref="ChineseFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new ChineseTokenizer(reader);
return new TokenStreamComponents(source, new ChineseFilter(source));
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
index 1f2d00d..7dc0d97 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
@@ -29,7 +29,7 @@ namespace Lucene.Net.Analysis.Core
{
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
return new TokenStreamComponents(new KeywordTokenizer(reader));
}
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs
index 0d49f35..3c0ac9a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Analysis.Core
this.matchVersion = matchVersion;
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
return new TokenStreamComponents(new LowerCaseTokenizer(matchVersion, reader));
}
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs
index 6154be8..f06d3f4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs
@@ -100,7 +100,7 @@ namespace Lucene.Net.Analysis.Core
/// <returns> <see cref="TokenStreamComponents"/>
/// built from a <see cref="LowerCaseTokenizer"/> filtered with
/// <see cref="StopFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new LowerCaseTokenizer(m_matchVersion, reader);
return new TokenStreamComponents(source, new StopFilter(m_matchVersion, source, m_stopwords));
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs
index 09e8028..e49fc57 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs
@@ -46,7 +46,7 @@ namespace Lucene.Net.Analysis.Core
this.matchVersion = matchVersion;
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
return new TokenStreamComponents(new WhitespaceTokenizer(matchVersion, reader));
}
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs
index d58143f..4facb41 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Analysis.Cz
/// <see cref="SetKeywordMarkerFilter"/> is added before
/// <see cref="CzechStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs
index 071dfee..f053bc6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Analysis.Da
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs
index def3ff4..818a48d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs
@@ -171,7 +171,7 @@ namespace Lucene.Net.Analysis.De
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided, <see cref="GermanNormalizationFilter"/> and <see cref="GermanLightStemFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs
index aa6f51f..3aa8fb3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs
@@ -112,7 +112,7 @@ namespace Lucene.Net.Analysis.El
/// built from a <see cref="StandardTokenizer"/> filtered with
/// <see cref="GreekLowerCaseFilter"/>, <see cref="StandardFilter"/>,
/// <see cref="StopFilter"/>, and <see cref="GreekStemFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new GreekLowerCaseFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs
index 4c4d16c..9328696 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Analysis.En
/// <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="PorterStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs
index 91f16ee..8c19564 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs
@@ -128,7 +128,7 @@ namespace Lucene.Net.Analysis.Es
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SpanishLightStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs
index 2afdc16..9331267 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Analysis.Eu
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs
index 4c4aa3a..780cd83 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs
@@ -115,7 +115,7 @@ namespace Lucene.Net.Analysis.Fa
/// built from a <see cref="StandardTokenizer"/> filtered with
/// <see cref="LowerCaseFilter"/>, <see cref="ArabicNormalizationFilter"/>,
/// <see cref="PersianNormalizationFilter"/> and Persian Stop words </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source;
#pragma warning disable 612, 618
@@ -144,7 +144,7 @@ namespace Lucene.Net.Analysis.Fa
/// <summary>
/// Wraps the <see cref="TextReader"/> with <see cref="PersianCharFilter"/>
/// </summary>
- protected override TextReader InitReader(string fieldName, TextReader reader)
+ protected internal override TextReader InitReader(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
return m_matchVersion.OnOrAfter(LuceneVersion.LUCENE_31) ?
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs
index 9ebb7ca..585da0b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Analysis.Fi
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs
index b3f1d60..e901de9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs
@@ -185,7 +185,7 @@ namespace Lucene.Net.Analysis.Fr
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided, and <see cref="FrenchLightStemFilter"/> </returns>
///
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
if (m_matchVersion.OnOrAfter(LuceneVersion.LUCENE_31))
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs
index a045269..afaf635 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs
@@ -132,7 +132,7 @@ namespace Lucene.Net.Analysis.Ga
/// <see cref="StandardFilter"/>, <see cref="IrishLowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs
index 6cf1c61..dac4b14 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs
@@ -118,7 +118,7 @@ namespace Lucene.Net.Analysis.Gl
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="GalicianStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs
index 3dbbe3e..6a86570 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs
@@ -124,7 +124,7 @@ namespace Lucene.Net.Analysis.Hi
/// <see cref="HindiNormalizationFilter"/>, <see cref="SetKeywordMarkerFilter"/>
/// if a stem exclusion set is provided, <see cref="HindiStemFilter"/>, and
/// Hindi Stop words </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source;
#pragma warning disable 612, 618
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs
index 6d17272..7527109 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Analysis.Hu
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs
index 48a9393..8f89081 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs
@@ -116,7 +116,7 @@ namespace Lucene.Net.Analysis.Hy
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs
index c59f8a3..8e2f5bc 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs
@@ -117,7 +117,7 @@ namespace Lucene.Net.Analysis.Id
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>,
/// <see cref="StopFilter"/>, <see cref="SetKeywordMarkerFilter"/>
/// if a stem exclusion set is provided and <see cref="IndonesianStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs
index b64c2ae..33fde81 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs
@@ -136,7 +136,7 @@ namespace Lucene.Net.Analysis.It
/// <see cref="StandardFilter"/>, <see cref="ElisionFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="ItalianLightStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs
index 175334c..04b4888 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs
@@ -119,7 +119,7 @@ namespace Lucene.Net.Analysis.Lv
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="LatvianStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
index 3efb94f..166af3f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
@@ -225,7 +225,7 @@ namespace Lucene.Net.Analysis.Miscellaneous
/// <param name="reader">
/// the reader delivering the text </param>
/// <returns> a new token stream </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
return CreateComponents(fieldName, reader, null);
}
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
index 069db02..44ee924 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
@@ -203,7 +203,7 @@ namespace Lucene.Net.Analysis.Nl
/// filtered with <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>,
/// <see cref="StopFilter"/>, <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is provided,
/// <see cref="StemmerOverrideFilter"/>, and <see cref="SnowballFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader aReader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader aReader)
{
#pragma warning disable 612, 618
if (matchVersion.OnOrAfter(LuceneVersion.LUCENE_31))
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs
index a74b36d..93e4f0d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs
@@ -120,7 +120,7 @@ namespace Lucene.Net.Analysis.No
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs
index df98425..6119bf8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs
@@ -125,7 +125,7 @@ namespace Lucene.Net.Analysis.Pt
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>
/// , <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="PortugueseLightStemFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs
index 865f6a8..da99abd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Analysis.Ro
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs
index 8af58b2..2421329 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs
@@ -149,7 +149,7 @@ namespace Lucene.Net.Analysis.Ru
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>
/// , <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided, and <see cref="SnowballFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
if (m_matchVersion.OnOrAfter(LuceneVersion.LUCENE_31))
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs
index 24e9be9..8fd6f4c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs
@@ -69,7 +69,7 @@ namespace Lucene.Net.Analysis.Snowball
/// <see cref="StandardFilter"/>, a <see cref="LowerCaseFilter"/>, a <see cref="StopFilter"/>,
/// and a <see cref="SnowballFilter"/>
/// </summary>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer tokenizer = new StandardTokenizer(matchVersion, reader);
TokenStream result = new StandardFilter(matchVersion, tokenizer);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs
index f5b42e0..dd16b44 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs
@@ -97,7 +97,7 @@ namespace Lucene.Net.Analysis.Standard
get { return maxTokenLength; }
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
var src = new ClassicTokenizer(m_matchVersion, reader);
src.MaxTokenLength = maxTokenLength;
@@ -122,7 +122,7 @@ namespace Lucene.Net.Analysis.Standard
this.src = src;
}
- protected override void SetReader(TextReader reader)
+ protected internal override void SetReader(TextReader reader)
{
src.MaxTokenLength = outerInstance.maxTokenLength;
base.SetReader(reader);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs
index ca6c60c..ed7c36c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Analysis.Standard
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
var src = new StandardTokenizer(m_matchVersion, reader);
src.MaxTokenLength = maxTokenLength;
@@ -129,7 +129,7 @@ namespace Lucene.Net.Analysis.Standard
this.src = src;
}
- protected override void SetReader(TextReader reader)
+ protected internal override void SetReader(TextReader reader)
{
src.MaxTokenLength = outerInstance.maxTokenLength;
base.SetReader(reader);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs
index 65aecc2..0d3843c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs
@@ -88,7 +88,7 @@ namespace Lucene.Net.Analysis.Standard
get { return maxTokenLength; }
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
UAX29URLEmailTokenizer src = new UAX29URLEmailTokenizer(m_matchVersion, reader);
src.MaxTokenLength = maxTokenLength;
@@ -113,7 +113,7 @@ namespace Lucene.Net.Analysis.Standard
this.src = src;
}
- protected override void SetReader(TextReader reader)
+ protected internal override void SetReader(TextReader reader)
{
src.MaxTokenLength = outerInstance.maxTokenLength;
base.SetReader(reader);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs
index 4520ecc..d73cb1b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs
@@ -121,7 +121,7 @@ namespace Lucene.Net.Analysis.Sv
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem exclusion set is
/// provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs
index 027627a..0db4554 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs
@@ -109,7 +109,7 @@ namespace Lucene.Net.Analysis.Synonym
this.factory = factory;
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
Tokenizer tokenizer = factory == null ? new WhitespaceTokenizer(LuceneVersion.LUCENE_CURRENT, reader) : factory.Create(reader);
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs
index b9a6e6c..22067d0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Analysis.Th
/// built from a <see cref="StandardTokenizer"/> filtered with
/// <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="ThaiWordFilter"/>, and
/// <see cref="StopFilter"/> </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
if (m_matchVersion.OnOrAfter(LuceneVersion.LUCENE_48))
{
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs
index 70a5af3..12503cd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs
@@ -122,7 +122,7 @@ namespace Lucene.Net.Analysis.Tr
/// <see cref="StandardFilter"/>, <see cref="TurkishLowerCaseFilter"/>,
/// <see cref="StopFilter"/>, <see cref="SetKeywordMarkerFilter"/> if a stem
/// exclusion set is provided and <see cref="SnowballFilter"/>. </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new StandardFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
index 356b022..57308e8 100644
--- a/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
+++ b/src/Lucene.Net.Analysis.Common/Lucene.Net.Analysis.Common.csproj
@@ -36,7 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
<EmbeddedResource Include="Analysis\Gl\galician.rslp;Analysis\Pt\portuguese.rslp;Analysis\Compound\Hyphenation\hyphenation.dtd" />
<EmbeddedResource Include="Analysis\**\stopwords.txt;Analysis\Snowball\*_stop.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
</ItemGroup>
diff --git a/src/Lucene.Net.Analysis.Common/Properties/AssemblyInfo.cs b/src/Lucene.Net.Analysis.Common/Properties/AssemblyInfo.cs
index 76da382..2d5fd47 100644
--- a/src/Lucene.Net.Analysis.Common/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Analysis.Common/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs
index 637e526..2162dbb 100644
--- a/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.ICU/Collation/ICUCollationKeyAnalyzer.cs
@@ -92,7 +92,7 @@ namespace Lucene.Net.Collation
{
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
#pragma warning disable 612, 618
if (matchVersion.OnOrAfter(LuceneVersion.LUCENE_40))
diff --git a/src/Lucene.Net.Analysis.Kuromoji/JapaneseAnalyzer.cs b/src/Lucene.Net.Analysis.Kuromoji/JapaneseAnalyzer.cs
index 46e2539..49a1bc6 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/JapaneseAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/JapaneseAnalyzer.cs
@@ -102,7 +102,7 @@ namespace Lucene.Net.Analysis.Ja
}
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer tokenizer = new JapaneseTokenizer(reader, userDict, true, mode);
TokenStream stream = new JapaneseBaseFormFilter(tokenizer);
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
index ea717d0..2e52ae9 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
+++ b/src/Lucene.Net.Analysis.Kuromoji/Lucene.Net.Analysis.Kuromoji.csproj
@@ -36,7 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
<EmbeddedResource Include="stoptags.txt;stopwords.txt;Dict\CharacterDefinition.dat;Dict\ConnectionCosts.dat;Dict\TokenInfoDictionary$buffer.dat;Dict\TokenInfoDictionary$fst.dat;Dict\TokenInfoDictionary$posDict.dat;Dict\TokenInfoDictionary$targetMap.dat;Dict\UnknownDictionary$buffer.dat;Dict\UnknownDictionary$posDict.dat;Dict\UnknownDictionary$targetMap.dat" />
</ItemGroup>
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs b/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
index 05f0403..e5812a8 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
index c87a7f0..c0e48f1 100644
--- a/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
+++ b/src/Lucene.Net.Analysis.Morfologik/Lucene.Net.Analysis.Morfologik.csproj
@@ -37,6 +37,10 @@
</PropertyGroup>
<ItemGroup>
+ <Compile Remove="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
<None Remove="Uk\mapping_uk.txt" />
<None Remove="Uk\README" />
<None Remove="Uk\stopwords.txt" />
@@ -46,10 +50,6 @@
</ItemGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<EmbeddedResource Include="Uk\mapping_uk.txt" />
<EmbeddedResource Include="Uk\README" />
<EmbeddedResource Include="Uk\stopwords.txt" />
@@ -59,6 +59,10 @@
</ItemGroup>
<ItemGroup>
+ <None Include="Properties\AssemblyInfo.cs" />
+ </ItemGroup>
+
+ <ItemGroup>
<PackageReference Include="Morfologik.Fsa" Version="$(MorfologikFsaPackageVersion)" />
<PackageReference Include="Morfologik.Polish" Version="$(MorfologikPolishPackageVersion)" />
<PackageReference Include="Morfologik.Stemming" Version="$(MorfologikStemmingPackageVersion)" />
diff --git a/src/Lucene.Net.Analysis.Morfologik/Morfologik/MorfologikAnalyzer.cs b/src/Lucene.Net.Analysis.Morfologik/Morfologik/MorfologikAnalyzer.cs
index 9147da2..a097e73 100644
--- a/src/Lucene.Net.Analysis.Morfologik/Morfologik/MorfologikAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Morfologik/Morfologik/MorfologikAnalyzer.cs
@@ -66,7 +66,7 @@ namespace Lucene.Net.Analysis.Morfologik
/// <returns>A <see cref="TokenStreamComponents"/>
/// built from a <see cref="StandardTokenizer"/> filtered with
/// <see cref="MorfologikFilter"/>.</returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer src = new StandardTokenizer(this.version, reader);
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs b/src/Lucene.Net.Analysis.Morfologik/Properties/AssemblyInfo.cs
similarity index 84%
copy from src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
copy to src/Lucene.Net.Analysis.Morfologik/Properties/AssemblyInfo.cs
index 05f0403..ce1ff11 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Analysis.Morfologik/Properties/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-/*
+/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -24,7 +23,7 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyDefaultAlias("Lucene.Net.Analysis.Kuromoji")]
+[assembly: AssemblyDefaultAlias("Lucene.Net.Analysis.Morfologik")]
[assembly: AssemblyCulture("")]
[assembly: CLSCompliant(true)]
@@ -35,9 +34,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8408625a-2508-46d5-8519-045183c43724")]
-
-// for testing
-[assembly: InternalsVisibleTo("Lucene.Net.Tests.Analysis.Kuromoji, PublicKey=" + AssemblyKeys.PublicKey)]
-
-
+[assembly: Guid("2e4a99a0-c52e-4e66-9246-69ef75124b61")]
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Morfologik/Uk/UkrainianMorfologikAnalyzer.cs b/src/Lucene.Net.Analysis.Morfologik/Uk/UkrainianMorfologikAnalyzer.cs
index e38e974..eb6648c 100644
--- a/src/Lucene.Net.Analysis.Morfologik/Uk/UkrainianMorfologikAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Morfologik/Uk/UkrainianMorfologikAnalyzer.cs
@@ -111,7 +111,7 @@ namespace Lucene.Net.Analysis.Uk
this.stemExclusionSet = CharArraySet.UnmodifiableSet(CharArraySet.Copy(matchVersion, stemExclusionSet));
}
- protected override TextReader InitReader(string fieldName, TextReader reader)
+ protected internal override TextReader InitReader(string fieldName, TextReader reader)
{
NormalizeCharMap.Builder builder = new NormalizeCharMap.Builder();
// different apostrophes
@@ -140,7 +140,7 @@ namespace Lucene.Net.Analysis.Uk
/// <returns>A <see cref="TokenStreamComponents"/> built from a <see cref="StandardTokenizer"/>
/// filtered with <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>, <see cref="SetKeywordMarkerFilter"/>
/// if a stem exclusion set is provided and <see cref="MorfologikFilter"/> on the Ukrainian dictionary.</returns>
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
TokenStream result = new LowerCaseFilter(m_matchVersion, source);
diff --git a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
index 48bd63d..d701218 100644
--- a/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
+++ b/src/Lucene.Net.Analysis.OpenNLP/Lucene.Net.Analysis.OpenNLP.csproj
@@ -42,10 +42,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" />
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
<ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs b/src/Lucene.Net.Analysis.OpenNLP/Properties/AssemblyInfo.cs
similarity index 82%
copy from src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
copy to src/Lucene.Net.Analysis.OpenNLP/Properties/AssemblyInfo.cs
index 05f0403..d4a1140 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Analysis.OpenNLP/Properties/AssemblyInfo.cs
@@ -15,7 +15,6 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -24,10 +23,10 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
-[assembly: AssemblyDefaultAlias("Lucene.Net.Analysis.Kuromoji")]
+[assembly: AssemblyDefaultAlias("Lucene.Net.Analysis.OpenNLP")]
[assembly: AssemblyCulture("")]
-[assembly: CLSCompliant(true)]
+[assembly: CLSCompliant(false)] // OpenNLP.NET is not CLS compliant
// Setting ComVisible to false makes the types in this assembly not visible
// to COM components. If you need to access a type in this assembly from
@@ -35,9 +34,4 @@ using System.Runtime.InteropServices;
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("8408625a-2508-46d5-8519-045183c43724")]
-
-// for testing
-[assembly: InternalsVisibleTo("Lucene.Net.Tests.Analysis.Kuromoji, PublicKey=" + AssemblyKeys.PublicKey)]
-
-
+[assembly: Guid("7695c395-37dd-42d1-af27-6e0bf82bdb15")]
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
index 87257f5..bcc2416 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
+++ b/src/Lucene.Net.Analysis.Phonetic/Lucene.Net.Analysis.Phonetic.csproj
@@ -36,7 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
<EmbeddedResource Include="Language\Bm\lang.txt;Language\dmrules.txt" />
<EmbeddedResource Include="Language\Bm\ash_*.txt;Language\Bm\gen_*.txt;Language\Bm\sep_*.txt" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
</ItemGroup>
diff --git a/src/Lucene.Net.Analysis.Phonetic/Properties/AssemblyInfo.cs b/src/Lucene.Net.Analysis.Phonetic/Properties/AssemblyInfo.cs
index 868b73c..4dfbafc 100644
--- a/src/Lucene.Net.Analysis.Phonetic/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Analysis.Phonetic/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Analysis.SmartCn/SmartChineseAnalyzer.cs b/src/Lucene.Net.Analysis.SmartCn/SmartChineseAnalyzer.cs
index a93ec1d..4f0e3fc 100644
--- a/src/Lucene.Net.Analysis.SmartCn/SmartChineseAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.SmartCn/SmartChineseAnalyzer.cs
@@ -142,7 +142,7 @@ namespace Lucene.Net.Analysis.Cn.Smart
this.matchVersion = matchVersion;
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer tokenizer;
TokenStream result;
diff --git a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
index c49e2c8..6260f87 100644
--- a/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
+++ b/src/Lucene.Net.Analysis.Stempel/Lucene.Net.Analysis.Stempel.csproj
@@ -36,7 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
<EmbeddedResource Include="Pl\stemmer_20000.tbl;Pl\stopwords.txt" />
</ItemGroup>
diff --git a/src/Lucene.Net.Analysis.Stempel/Pl/PolishAnalyzer.cs b/src/Lucene.Net.Analysis.Stempel/Pl/PolishAnalyzer.cs
index 68c31f8..a830aef 100644
--- a/src/Lucene.Net.Analysis.Stempel/Pl/PolishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Stempel/Pl/PolishAnalyzer.cs
@@ -152,7 +152,7 @@ namespace Lucene.Net.Analysis.Pl
/// filtered with <see cref="StandardFilter"/>, <see cref="LowerCaseFilter"/>, <see cref="StopFilter"/>,
/// <see cref="SetKeywordMarkerFilter"/> if a stem excusion set is provided and <see cref="StempelFilter"/>.
/// </returns>
- protected override TokenStreamComponents CreateComponents(string fieldName,
+ protected internal override TokenStreamComponents CreateComponents(string fieldName,
TextReader reader)
{
Tokenizer source = new StandardTokenizer(m_matchVersion, reader);
diff --git a/src/Lucene.Net.Analysis.Stempel/Properties/AssemblyInfo.cs b/src/Lucene.Net.Analysis.Stempel/Properties/AssemblyInfo.cs
index 9bc94f9..dcb09be 100644
--- a/src/Lucene.Net.Analysis.Stempel/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Analysis.Stempel/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs b/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs
index 28a3ff6..ca24ada 100644
--- a/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs
+++ b/src/Lucene.Net.Benchmark/ByTask/Utils/AnalyzerFactory.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils
this.outerInstance = outerInstance;
}
- protected override TextReader InitReader(string fieldName, TextReader reader)
+ protected internal override TextReader InitReader(string fieldName, TextReader reader)
{
if (outerInstance.charFilterFactories != null && outerInstance.charFilterFactories.Count > 0)
{
@@ -77,7 +77,7 @@ namespace Lucene.Net.Benchmarks.ByTask.Utils
return reader;
}
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
+ protected internal override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
{
Tokenizer tokenizer = outerInstance.tokenizerFactory.Create(reader);
TokenStream tokenStream = tokenizer;
diff --git a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
index fb4b3ad..ef37d35 100644
--- a/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
+++ b/src/Lucene.Net.Benchmark/Lucene.Net.Benchmark.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\dotnet\Lucene.Net.ICU\Lucene.Net.ICU.csproj" />
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
<ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
diff --git a/src/Lucene.Net.Benchmark/Properties/AssemblyInfo.cs b/src/Lucene.Net.Benchmark/Properties/AssemblyInfo.cs
index d6ded34..4611a66 100644
--- a/src/Lucene.Net.Benchmark/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Benchmark/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs b/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
index d29228d..3e204ff 100644
--- a/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
+++ b/src/Lucene.Net.Benchmark/Quality/Utils/QualityQueriesFinder.cs
@@ -145,7 +145,7 @@ namespace Lucene.Net.Benchmarks.Quality.Utils
{
}
- protected override bool LessThan(TermDf tf1, TermDf tf2)
+ protected internal override bool LessThan(TermDf tf1, TermDf tf2)
{
return tf1.df < tf2.df;
}
diff --git a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
index 31ef7f6..d2ca967 100644
--- a/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
+++ b/src/Lucene.Net.Demo/Lucene.Net.Demo.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
<ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
<ProjectReference Include="..\Lucene.Net.Expressions\Lucene.Net.Expressions.csproj" />
diff --git a/src/Lucene.Net.Demo/Properties/AssemblyInfo.cs b/src/Lucene.Net.Demo/Properties/AssemblyInfo.cs
index 42a8be6..a4a478f 100644
--- a/src/Lucene.Net.Demo/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Demo/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
index 745d654..22e8a58 100644
--- a/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
+++ b/src/Lucene.Net.Facet/Lucene.Net.Facet.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net.Join\Lucene.Net.Join.csproj" />
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
diff --git a/src/Lucene.Net.Facet/Properties/AssemblyInfo.cs b/src/Lucene.Net.Facet/Properties/AssemblyInfo.cs
index 202f267..e11e4a8 100644
--- a/src/Lucene.Net.Facet/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Facet/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs b/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
index e887697..4f87ba1 100644
--- a/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
+++ b/src/Lucene.Net.Grouping/AbstractGroupFacetCollector.cs
@@ -334,7 +334,7 @@ namespace Lucene.Net.Search.Grouping
{
}
- protected override bool LessThan(AbstractSegmentResult a, AbstractSegmentResult b)
+ protected internal override bool LessThan(AbstractSegmentResult a, AbstractSegmentResult b)
{
return a.m_mergeTerm.CompareTo(b.m_mergeTerm) < 0;
}
diff --git a/src/Lucene.Net.Grouping/BlockGroupingCollector.cs b/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
index 6f38ca3..d54bb99 100644
--- a/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
+++ b/src/Lucene.Net.Grouping/BlockGroupingCollector.cs
@@ -160,7 +160,7 @@ namespace Lucene.Net.Search.Grouping
this.outerInstance = outerInstance;
}
- protected override bool LessThan(OneGroup group1, OneGroup group2)
+ protected internal override bool LessThan(OneGroup group1, OneGroup group2)
{
//System.out.println(" ltcheck");
diff --git a/src/Lucene.Net.Highlighter/Highlight/Highlighter.cs b/src/Lucene.Net.Highlighter/Highlight/Highlighter.cs
index 82c6a98..56b78d5 100644
--- a/src/Lucene.Net.Highlighter/Highlight/Highlighter.cs
+++ b/src/Lucene.Net.Highlighter/Highlight/Highlighter.cs
@@ -463,7 +463,7 @@ namespace Lucene.Net.Search.Highlight
{
public FragmentQueue(int size) : base(size) { }
- protected override bool LessThan(TextFragment fragA, TextFragment fragB)
+ protected internal override bool LessThan(TextFragment fragA, TextFragment fragB)
{
if (fragA.Score == fragB.Score)
return fragA.FragNum > fragB.FragNum;
diff --git a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
index e59f39d..c8a563a 100644
--- a/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
+++ b/src/Lucene.Net.Highlighter/Lucene.Net.Highlighter.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net.Memory\Lucene.Net.Memory.csproj" />
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
diff --git a/src/Lucene.Net.Highlighter/Properties/AssemblyInfo.cs b/src/Lucene.Net.Highlighter/Properties/AssemblyInfo.cs
index 8c22146..63ff11c 100644
--- a/src/Lucene.Net.Highlighter/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Highlighter/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Join/Lucene.Net.Join.csproj b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
index 678c8cb..9ccea12 100644
--- a/src/Lucene.Net.Join/Lucene.Net.Join.csproj
+++ b/src/Lucene.Net.Join/Lucene.Net.Join.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net.Grouping\Lucene.Net.Grouping.csproj" />
</ItemGroup>
diff --git a/src/Lucene.Net.Join/Properties/AssemblyInfo.cs b/src/Lucene.Net.Join/Properties/AssemblyInfo.cs
index c4c7b98..72d1fbb 100644
--- a/src/Lucene.Net.Join/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Join/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
index 51a49e1..0c30be5 100644
--- a/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
+++ b/src/Lucene.Net.Memory/Lucene.Net.Memory.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
</ItemGroup>
diff --git a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
index 1728387..8023144 100644
--- a/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
+++ b/src/Lucene.Net.Memory/MemoryIndex.MemoryIndexReader.cs
@@ -651,7 +651,7 @@ namespace Lucene.Net.Index.Memory
#endif
// no-op: there are no stored fields
}
- protected override void DoClose()
+ protected internal override void DoClose()
{
#if DEBUG
Debug.WriteLine("MemoryIndexReader.DoClose");
diff --git a/src/Lucene.Net.Memory/Properties/AssemblyInfo.cs b/src/Lucene.Net.Memory/Properties/AssemblyInfo.cs
index 1d26a9c..be9bdaf 100644
--- a/src/Lucene.Net.Memory/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Memory/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Misc/Properties/AssemblyInfo.cs b/src/Lucene.Net.Misc/Properties/AssemblyInfo.cs
index cb32b20..0125533 100644
--- a/src/Lucene.Net.Misc/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Misc/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
index 0d9a375..636837a 100644
--- a/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
+++ b/src/Lucene.Net.Queries/Mlt/MoreLikeThis.cs
@@ -723,7 +723,7 @@ namespace Lucene.Net.Queries.Mlt
{
}
- protected override bool LessThan(object[] aa, object[] bb)
+ protected internal override bool LessThan(object[] aa, object[] bb)
{
float? fa = (float?)aa[2];
float? fb = (float?)bb[2];
diff --git a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
index a1a4613..41fa169 100644
--- a/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
+++ b/src/Lucene.Net.QueryParser/Lucene.Net.QueryParser.csproj
@@ -34,10 +34,6 @@
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
<NoWarn>$(NoWarn);1591;1573</NoWarn>
</PropertyGroup>
-
- <ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
diff --git a/src/Lucene.Net.QueryParser/Properties/AssemblyInfo.cs b/src/Lucene.Net.QueryParser/Properties/AssemblyInfo.cs
index 93083e4..c8676e2 100644
--- a/src/Lucene.Net.QueryParser/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.QueryParser/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
index 555f3d9..e0de916 100644
--- a/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
+++ b/src/Lucene.Net.Sandbox/Queries/FuzzyLikeThisQuery.cs
@@ -363,7 +363,7 @@ namespace Lucene.Net.Sandbox.Queries
/// (non-Javadoc)
/// <see cref="Util.PriorityQueue{T}.LessThan(T, T)"/>
/// </summary>
- protected override bool LessThan(ScoreTerm termA, ScoreTerm termB)
+ protected internal override bool LessThan(ScoreTerm termA, ScoreTerm termB)
{
if (termA.Score == termB.Score)
return termA.Term.CompareTo(termB.Term) > 0;
diff --git a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
index 2d5b0b8..c2e2ba5 100644
--- a/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
+++ b/src/Lucene.Net.Spatial/Lucene.Net.Spatial.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net\Lucene.Net.csproj" />
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
</ItemGroup>
diff --git a/src/Lucene.Net.Spatial/Properties/AssemblyInfo.cs b/src/Lucene.Net.Spatial/Properties/AssemblyInfo.cs
index fa964fd..63eac5f 100644
--- a/src/Lucene.Net.Spatial/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Spatial/Properties/AssemblyInfo.cs
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
index 5c78bf6..f3302b8 100644
--- a/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
+++ b/src/Lucene.Net.Suggest/Lucene.Net.Suggest.csproj
@@ -36,10 +36,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
- </ItemGroup>
-
- <ItemGroup>
<ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
<ProjectReference Include="..\Lucene.Net.Misc\Lucene.Net.Misc.csproj" />
<ProjectReference Include="..\Lucene.Net.Queries\Lucene.Net.Queries.csproj" />
diff --git a/src/Lucene.Net.Suggest/Properties/AssemblyInfo.cs b/src/Lucene.Net.Suggest/Properties/AssemblyInfo.cs
index 2da2904..11b8c3b 100644
--- a/src/Lucene.Net.Suggest/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.Suggest/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.Suggest/Spell/SuggestWordQueue.cs b/src/Lucene.Net.Suggest/Spell/SuggestWordQueue.cs
index e6b95da..18b683c 100644
--- a/src/Lucene.Net.Suggest/Spell/SuggestWordQueue.cs
+++ b/src/Lucene.Net.Suggest/Spell/SuggestWordQueue.cs
@@ -54,7 +54,7 @@ namespace Lucene.Net.Search.Spell
this.comparer = comparer;
}
- protected override bool LessThan(SuggestWord wa, SuggestWord wb)
+ protected internal override bool LessThan(SuggestWord wa, SuggestWord wb)
{
int val = comparer.Compare(wa, wb);
return val < 0;
diff --git a/src/Lucene.Net.Suggest/Suggest/Lookup.cs b/src/Lucene.Net.Suggest/Suggest/Lookup.cs
index 30b18ab..892a59c 100644
--- a/src/Lucene.Net.Suggest/Suggest/Lookup.cs
+++ b/src/Lucene.Net.Suggest/Suggest/Lookup.cs
@@ -166,7 +166,7 @@ namespace Lucene.Net.Search.Suggest
{
}
- protected override bool LessThan(LookupResult a, LookupResult b)
+ protected internal override bool LessThan(LookupResult a, LookupResult b)
{
return a.Value < b.Value;
}
diff --git a/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs b/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
index 677e90c..95228b0 100644
--- a/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net.TestFramework/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index d18f56c..6b55fd5 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -460,6 +460,10 @@ namespace Lucene.Net.Support
{
continue;
}
+ if (!string.IsNullOrEmpty(c.Name) && c.Name.Equals("AssemblyKeys", StringComparison.Ordinal))
+ {
+ continue;
+ }
var fields = c.GetFields(BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance);
diff --git a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
index 8290ae3..b9e3d5f 100644
--- a/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
+++ b/src/Lucene.Net/Codecs/BlockTreeTermsReader.cs
@@ -220,7 +220,7 @@ namespace Lucene.Net.Codecs
/// <summary>
/// Reads terms file header. </summary>
- protected internal virtual int ReadHeader(IndexInput input)
+ protected virtual int ReadHeader(IndexInput input)
{
int version = CodecUtil.CheckHeader(input, BlockTreeTermsWriter.TERMS_CODEC_NAME, BlockTreeTermsWriter.VERSION_START, BlockTreeTermsWriter.VERSION_CURRENT);
if (version < BlockTreeTermsWriter.VERSION_APPEND_ONLY)
@@ -232,7 +232,7 @@ namespace Lucene.Net.Codecs
/// <summary>
/// Reads index file header. </summary>
- protected internal virtual int ReadIndexHeader(IndexInput input)
+ protected virtual int ReadIndexHeader(IndexInput input)
{
int version = CodecUtil.CheckHeader(input, BlockTreeTermsWriter.TERMS_INDEX_CODEC_NAME, BlockTreeTermsWriter.VERSION_START, BlockTreeTermsWriter.VERSION_CURRENT);
if (version < BlockTreeTermsWriter.VERSION_APPEND_ONLY)
@@ -244,7 +244,7 @@ namespace Lucene.Net.Codecs
/// <summary>
/// Seek <paramref name="input"/> to the directory offset. </summary>
- protected internal virtual void SeekDir(IndexInput input, long dirOffset)
+ protected virtual void SeekDir(IndexInput input, long dirOffset)
{
if (version >= BlockTreeTermsWriter.VERSION_CHECKSUM)
{
diff --git a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
index 5b8f33f..6db6236 100644
--- a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
+++ b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesConsumer.cs
@@ -355,7 +355,7 @@ namespace Lucene.Net.Codecs.Lucene45
/// <summary>
/// Expert: writes a value dictionary for a sorted/sortedset field. </summary>
- protected internal virtual void AddTermsDict(FieldInfo field, IEnumerable<BytesRef> values)
+ protected virtual void AddTermsDict(FieldInfo field, IEnumerable<BytesRef> values)
{
// first check if its a "fixed-length" terms dict
int minLength = int.MaxValue;
diff --git a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
index 4f2eb1d..6bf066a 100644
--- a/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
+++ b/src/Lucene.Net/Codecs/Lucene45/Lucene45DocValuesProducer.cs
@@ -503,7 +503,7 @@ namespace Lucene.Net.Codecs.Lucene45
/// <para/>
/// @lucene.internal
/// </summary>
- protected internal virtual MonotonicBlockPackedReader GetAddressInstance(IndexInput data, FieldInfo field, BinaryEntry bytes)
+ protected virtual MonotonicBlockPackedReader GetAddressInstance(IndexInput data, FieldInfo field, BinaryEntry bytes)
{
MonotonicBlockPackedReader addresses;
lock (addressInstances)
@@ -574,7 +574,7 @@ namespace Lucene.Net.Codecs.Lucene45
/// <para/>
/// @lucene.internal
/// </summary>
- protected internal virtual MonotonicBlockPackedReader GetIntervalInstance(IndexInput data, FieldInfo field, BinaryEntry bytes)
+ protected virtual MonotonicBlockPackedReader GetIntervalInstance(IndexInput data, FieldInfo field, BinaryEntry bytes)
{
MonotonicBlockPackedReader addresses;
long interval = bytes.AddressInterval;
@@ -687,7 +687,7 @@ namespace Lucene.Net.Codecs.Lucene45
/// <para/>
/// @lucene.internal
/// </summary>
- protected internal virtual MonotonicBlockPackedReader GetOrdIndexInstance(IndexInput data, FieldInfo field, NumericEntry entry)
+ protected virtual MonotonicBlockPackedReader GetOrdIndexInstance(IndexInput data, FieldInfo field, NumericEntry entry)
{
MonotonicBlockPackedReader ordIndex;
lock (ordIndexInstances)
diff --git a/src/Lucene.Net/Lucene.Net.csproj b/src/Lucene.Net/Lucene.Net.csproj
index 569acf1..edcf9bd 100644
--- a/src/Lucene.Net/Lucene.Net.csproj
+++ b/src/Lucene.Net/Lucene.Net.csproj
@@ -34,8 +34,15 @@
<NoWarn>$(NoWarn);1591;1573</NoWarn>
</PropertyGroup>
- <ItemGroup>
- <Compile Include="..\CommonAssemblyKeys.cs" Link="Properties\CommonAssemblyKeys.cs" />
+ <PropertyGroup Label="NuGet Package File Paths">
+ <LuceneNetCodeAnalysisDir>$(SolutionDir)src\dotnet\Lucene.Net.CodeAnalysis\</LuceneNetCodeAnalysisDir>
+ <LuceneNetCodeAnalysisAssemblyFile>$(LuceneNetCodeAnalysisDir)bin\$(Configuration)\netstandard2.0\*.dll</LuceneNetCodeAnalysisAssemblyFile>
+ </PropertyGroup>
+
+ <ItemGroup Label="NuGet Package Files">
+ <None Include="$(LuceneNetCodeAnalysisDir)tools\*.ps1" Pack="true" PackagePath="tools" />
+ <None Include="$(LuceneNetCodeAnalysisAssemblyFile)" Pack="true" PackagePath="analyzers/dotnet/cs" Visible="false" />
+ <None Include="$(LuceneNetCodeAnalysisAssemblyFile)" Pack="true" PackagePath="analyzers/dotnet/vb" Visible="false" />
</ItemGroup>
<ItemGroup>
diff --git a/src/Lucene.Net/Properties/AssemblyInfo.cs b/src/Lucene.Net/Properties/AssemblyInfo.cs
index f4ead0d..cc24a9d 100644
--- a/src/Lucene.Net/Properties/AssemblyInfo.cs
+++ b/src/Lucene.Net/Properties/AssemblyInfo.cs
@@ -15,9 +15,8 @@
* limitations under the License.
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
-using System.Diagnostics;
using System.Reflection;
using System.Runtime.CompilerServices;
@@ -33,8 +32,32 @@ using System.Runtime.CompilerServices;
// We need InternalsVisibleTo in order to prevent making everything public just for the sake of testing.
// This has broad implications because many methods are marked "protected internal", which means other assemblies
// must update overridden methods to match.
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.Common, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.Kuromoji, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.Morfologik, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.Nori, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.OpenNLP, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.Phonetic, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.SmartCn, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Analysis.Stempel, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Benchmark, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Classification, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Codecs, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Demo, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Expressions, PublicKey=" + AssemblyKeys.PublicKey)]
[assembly: InternalsVisibleTo("Lucene.Net.Facet, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Grouping, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Highlighter, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.ICU, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Join, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Memory, PublicKey=" + AssemblyKeys.PublicKey)]
[assembly: InternalsVisibleTo("Lucene.Net.Misc, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Queries, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.QueryParser, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Replicator, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Sandbox, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Spatial, PublicKey=" + AssemblyKeys.PublicKey)]
+[assembly: InternalsVisibleTo("Lucene.Net.Suggest, PublicKey=" + AssemblyKeys.PublicKey)]
[assembly: InternalsVisibleTo("Lucene.Net.Tests._A-D, PublicKey=" + AssemblyKeys.PublicKey)]
[assembly: InternalsVisibleTo("Lucene.Net.Tests._E-I, PublicKey=" + AssemblyKeys.PublicKey)]
[assembly: InternalsVisibleTo("Lucene.Net.Tests._J-S, PublicKey=" + AssemblyKeys.PublicKey)]
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs b/src/Lucene.Net/Properties/AssemblyKeys.cs
similarity index 62%
copy from src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
copy to src/Lucene.Net/Properties/AssemblyKeys.cs
index 1f2d00d..7658d1c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
+++ b/src/Lucene.Net/Properties/AssemblyKeys.cs
@@ -1,6 +1,4 @@
-using System.IO;
-
-namespace Lucene.Net.Analysis.Core
+namespace Lucene.Net
{
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -19,19 +17,13 @@ namespace Lucene.Net.Analysis.Core
* limitations under the License.
*/
- /// <summary>
- /// "Tokenizes" the entire stream as a single token. This is useful
- /// for data like zip codes, ids, and some product names.
- /// </summary>
- public sealed class KeywordAnalyzer : Analyzer
+ internal static class AssemblyKeys
{
- public KeywordAnalyzer()
- {
- }
-
- protected override TokenStreamComponents CreateComponents(string fieldName, TextReader reader)
- {
- return new TokenStreamComponents(new KeywordTokenizer(reader));
- }
+ public const string PublicKey =
+ "002400000480000094000000060200000024000052534131000400000100010075a07ce602f88e" +
+ "f263c7db8cb342c58ebd49ecdcc210fac874260b0213fb929ac3dcaf4f5b39744b800f99073eca" +
+ "72aebfac5f7284e1d5f2c82012a804a140f06d7d043d83e830cdb606a04da2ad5374cc92c0a495" +
+ "08437802fb4f8fb80a05e59f80afb99f4ccd0dfe44065743543c4b053b669509d29d332cd32a0c" +
+ "b1e97e84";
}
}
\ No newline at end of file
diff --git a/src/Lucene.Net/Util/PriorityQueue.cs b/src/Lucene.Net/Util/PriorityQueue.cs
index 36d5be5..b7d9e0a 100644
--- a/src/Lucene.Net/Util/PriorityQueue.cs
+++ b/src/Lucene.Net/Util/PriorityQueue.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Util
/// Determines the ordering of objects in this priority queue. Subclasses
/// must define this one method. </summary>
/// <returns> <c>true</c> if parameter <paramref name="a"/> is less than parameter <paramref name="b"/>. </returns>
- protected internal abstract bool LessThan(T a, T b);
+ protected internal abstract bool LessThan(T a, T b); // LUCENENET: Internal for testing
/// <summary>
/// This method can be overridden by extending classes to return a sentinel
diff --git a/src/dotnet/Lucene.Net.ICU/Properties/AssemblyInfo.cs b/src/dotnet/Lucene.Net.ICU/Properties/AssemblyInfo.cs
index 5d014ea..b78bdf5 100644
--- a/src/dotnet/Lucene.Net.ICU/Properties/AssemblyInfo.cs
+++ b/src/dotnet/Lucene.Net.ICU/Properties/AssemblyInfo.cs
@@ -19,7 +19,7 @@
*
*/
-using Lucene.Net.Support;
+using Lucene.Net;
using System;
using System.Reflection;
using System.Runtime.CompilerServices;