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 2021/02/25 04:06:39 UTC

[lucenenet] branch master updated (610e18f -> 6ff2ab2)

This is an automated email from the ASF dual-hosted git repository.

nightowl888 pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucenenet.git.


    from 610e18f  Lucene.Net.Tests.Expressions: Minor formatting and comment changes (See #259)
     new ca31ca4  SWEEP: Lucene.Net.Analysis.Common: Added Lucene version compatibility level 4.8.1 comment at the top of each file
     new 890d94b  SWEEP: Lucene.Net.Tests.Analysis.Common: Added Lucene version compatibility level 4.8.1 comment at the top of each file
     new beab426  Lucene.Net.Tests.Analysis.Common.csproj: Simplified embedded resource references
     new e7eb286  Lucene.Net.Analysis.Common: Upgraded Lucene.Net.Analysis.Hunspell namespace to Lucene 4.10.4 because 4.8.1 was buggy (fixes #418, fixes #419)
     new 3254d81  Lucene.Net.Analysis.Common: Added hunspell regression tests for #418
     new 55c8bc4  Lucene.Net.Tests.Analysis.Common: Simplified configuration to remove .dic and .aff files from the build
     new 88ae704  Lucene.Net.Tests.Analysis.Common: Removed dependency on System.Text.Encoding.Codepages, as it is not required in .NET Core 2.x and higher
     new 6ff2ab2  Lucene.Net.Tests.Analysis.Common.Analysis.Hunspell: Changed TestAllDictionaries and TestAllDictionaries2 data path to the root of the repo to match the .gitignore file

The 8 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../Analysis/Ar/ArabicAnalyzer.cs                  |   3 +-
 .../Analysis/Ar/ArabicLetterTokenizer.cs           |   3 +-
 .../Analysis/Ar/ArabicLetterTokenizerFactory.cs    |   3 +-
 .../Analysis/Ar/ArabicNormalizationFilter.cs       |   3 +-
 .../Ar/ArabicNormalizationFilterFactory.cs         |   3 +-
 .../Analysis/Ar/ArabicNormalizer.cs                |   3 +-
 .../Analysis/Ar/ArabicStemFilter.cs                |   3 +-
 .../Analysis/Ar/ArabicStemFilterFactory.cs         |   3 +-
 .../Analysis/Ar/ArabicStemmer.cs                   |   3 +-
 .../Analysis/Bg/BulgarianAnalyzer.cs               |   3 +-
 .../Analysis/Bg/BulgarianStemFilter.cs             |   3 +-
 .../Analysis/Bg/BulgarianStemFilterFactory.cs      |   3 +-
 .../Analysis/Bg/BulgarianStemmer.cs                |   3 +-
 .../Analysis/Br/BrazilianAnalyzer.cs               |   3 +-
 .../Analysis/Br/BrazilianStemFilter.cs             |   3 +-
 .../Analysis/Br/BrazilianStemFilterFactory.cs      |   3 +-
 .../Analysis/Br/BrazilianStemmer.cs                |   3 +-
 .../Analysis/Ca/CatalanAnalyzer.cs                 |   3 +-
 .../Analysis/CharFilter/BaseCharFilter.cs          |   3 +-
 .../Analysis/CharFilter/HTMLStripCharFilter.cs     |   5 +-
 .../CharFilter/HTMLStripCharFilterFactory.cs       |   3 +-
 .../Analysis/CharFilter/MappingCharFilter.cs       |   3 +-
 .../CharFilter/MappingCharFilterFactory.cs         |   3 +-
 .../Analysis/CharFilter/NormalizeCharMap.cs        |   3 +-
 .../Analysis/Cjk/CJKAnalyzer.cs                    |   3 +-
 .../Analysis/Cjk/CJKBigramFilter.cs                |   3 +-
 .../Analysis/Cjk/CJKBigramFilterFactory.cs         |   3 +-
 .../Analysis/Cjk/CJKTokenizer.cs                   |   3 +-
 .../Analysis/Cjk/CJKTokenizerFactory.cs            |   3 +-
 .../Analysis/Cjk/CJKWidthFilter.cs                 |   3 +-
 .../Analysis/Cjk/CJKWidthFilterFactory.cs          |   3 +-
 .../Analysis/Ckb/SoraniAnalyzer.cs                 |   3 +-
 .../Analysis/Ckb/SoraniNormalizationFilter.cs      |   3 +-
 .../Ckb/SoraniNormalizationFilterFactory.cs        |   3 +-
 .../Analysis/Ckb/SoraniNormalizer.cs               |   3 +-
 .../Analysis/Ckb/SoraniStemFilter.cs               |   3 +-
 .../Analysis/Ckb/SoraniStemFilterFactory.cs        |   3 +-
 .../Analysis/Ckb/SoraniStemmer.cs                  |   3 +-
 .../Analysis/Cn/ChineseAnalyzer.cs                 |   3 +-
 .../Analysis/Cn/ChineseFilter.cs                   |   3 +-
 .../Analysis/Cn/ChineseFilterFactory.cs            |   3 +-
 .../Analysis/Cn/ChineseTokenizer.cs                |   3 +-
 .../Analysis/Cn/ChineseTokenizerFactory.cs         |   3 +-
 .../Analysis/CommonGrams/CommonGramsFilter.cs      |   3 +-
 .../CommonGrams/CommonGramsFilterFactory.cs        |   3 +-
 .../Analysis/CommonGrams/CommonGramsQueryFilter.cs |   3 +-
 .../CommonGrams/CommonGramsQueryFilterFactory.cs   |   3 +-
 .../Compound/CompoundWordTokenFilterBase.cs        |   3 +-
 .../Compound/DictionaryCompoundWordTokenFilter.cs  |   3 +-
 .../DictionaryCompoundWordTokenFilterFactory.cs    |   3 +-
 .../Analysis/Compound/Hyphenation/ByteVector.cs    |   3 +-
 .../Analysis/Compound/Hyphenation/CharVector.cs    |   3 +-
 .../Analysis/Compound/Hyphenation/Hyphen.cs        |   3 +-
 .../Analysis/Compound/Hyphenation/Hyphenation.cs   |   3 +-
 .../Compound/Hyphenation/HyphenationTree.cs        |   3 +-
 .../Compound/Hyphenation/PatternConsumer.cs        |   3 +-
 .../Analysis/Compound/Hyphenation/PatternParser.cs |   3 +-
 .../Analysis/Compound/Hyphenation/TernaryTree.cs   |   3 +-
 .../Compound/HyphenationCompoundWordTokenFilter.cs |   3 +-
 .../HyphenationCompoundWordTokenFilterFactory.cs   |   3 +-
 .../Analysis/Core/KeywordAnalyzer.cs               |   3 +-
 .../Analysis/Core/KeywordTokenizer.cs              |   3 +-
 .../Analysis/Core/KeywordTokenizerFactory.cs       |   3 +-
 .../Analysis/Core/LetterTokenizer.cs               |   3 +-
 .../Analysis/Core/LetterTokenizerFactory.cs        |   3 +-
 .../Analysis/Core/LowerCaseFilter.cs               |   3 +-
 .../Analysis/Core/LowerCaseFilterFactory.cs        |   3 +-
 .../Analysis/Core/LowerCaseTokenizer.cs            |   3 +-
 .../Analysis/Core/LowerCaseTokenizerFactory.cs     |   3 +-
 .../Analysis/Core/SimpleAnalyzer.cs                |   3 +-
 .../Analysis/Core/StopAnalyzer.cs                  |   3 +-
 .../Analysis/Core/StopFilter.cs                    |   3 +-
 .../Analysis/Core/StopFilterFactory.cs             |   3 +-
 .../Analysis/Core/TypeTokenFilter.cs               |   3 +-
 .../Analysis/Core/TypeTokenFilterFactory.cs        |   3 +-
 .../Analysis/Core/UpperCaseFilter.cs               |   3 +-
 .../Analysis/Core/UpperCaseFilterFactory.cs        |   3 +-
 .../Analysis/Core/WhitespaceAnalyzer.cs            |   3 +-
 .../Analysis/Core/WhitespaceTokenizer.cs           |   3 +-
 .../Analysis/Core/WhitespaceTokenizerFactory.cs    |   3 +-
 .../Analysis/Cz/CzechAnalyzer.cs                   |   3 +-
 .../Analysis/Cz/CzechStemFilter.cs                 |   3 +-
 .../Analysis/Cz/CzechStemFilterFactory.cs          |   3 +-
 .../Analysis/Cz/CzechStemmer.cs                    |   3 +-
 .../Analysis/Da/DanishAnalyzer.cs                  |   3 +-
 .../Analysis/De/GermanAnalyzer.cs                  |   3 +-
 .../Analysis/De/GermanLightStemFilter.cs           |   3 +-
 .../Analysis/De/GermanLightStemFilterFactory.cs    |   3 +-
 .../Analysis/De/GermanLightStemmer.cs              |   3 +-
 .../Analysis/De/GermanMinimalStemFilter.cs         |   3 +-
 .../Analysis/De/GermanMinimalStemFilterFactory.cs  |   3 +-
 .../Analysis/De/GermanMinimalStemmer.cs            |   3 +-
 .../Analysis/De/GermanNormalizationFilter.cs       |   3 +-
 .../De/GermanNormalizationFilterFactory.cs         |   3 +-
 .../Analysis/De/GermanStemFilter.cs                |   3 +-
 .../Analysis/De/GermanStemFilterFactory.cs         |   3 +-
 .../Analysis/De/GermanStemmer.cs                   |   3 +-
 .../Analysis/El/GreekAnalyzer.cs                   |   3 +-
 .../Analysis/El/GreekLowerCaseFilter.cs            |   3 +-
 .../Analysis/El/GreekLowerCaseFilterFactory.cs     |   3 +-
 .../Analysis/El/GreekStemFilter.cs                 |   3 +-
 .../Analysis/El/GreekStemFilterFactory.cs          |   3 +-
 .../Analysis/El/GreekStemmer.cs                    |   3 +-
 .../Analysis/En/EnglishAnalyzer.cs                 |   3 +-
 .../Analysis/En/EnglishMinimalStemFilter.cs        |   3 +-
 .../Analysis/En/EnglishMinimalStemFilterFactory.cs |   3 +-
 .../Analysis/En/EnglishMinimalStemmer.cs           |   3 +-
 .../Analysis/En/EnglishPossessiveFilter.cs         |   3 +-
 .../Analysis/En/EnglishPossessiveFilterFactory.cs  |   3 +-
 .../Analysis/En/KStemData1.cs                      |   3 +-
 .../Analysis/En/KStemData2.cs                      |   3 +-
 .../Analysis/En/KStemData3.cs                      |   3 +-
 .../Analysis/En/KStemData4.cs                      |   3 +-
 .../Analysis/En/KStemData5.cs                      |   3 +-
 .../Analysis/En/KStemData6.cs                      |   3 +-
 .../Analysis/En/KStemData7.cs                      |   3 +-
 .../Analysis/En/KStemData8.cs                      |   3 +-
 .../Analysis/En/KStemFilter.cs                     |   3 +-
 .../Analysis/En/KStemFilterFactory.cs              |   3 +-
 .../Analysis/En/KStemmer.cs                        |   3 +-
 .../Analysis/En/PorterStemFilter.cs                |   3 +-
 .../Analysis/En/PorterStemFilterFactory.cs         |   3 +-
 .../Analysis/En/PorterStemmer.cs                   |   3 +-
 .../Analysis/Es/SpanishAnalyzer.cs                 |   3 +-
 .../Analysis/Es/SpanishLightStemFilter.cs          |   3 +-
 .../Analysis/Es/SpanishLightStemFilterFactory.cs   |   3 +-
 .../Analysis/Es/SpanishLightStemmer.cs             |   3 +-
 .../Analysis/Eu/BasqueAnalyzer.cs                  |   3 +-
 .../Analysis/Fa/PersianAnalyzer.cs                 |   3 +-
 .../Analysis/Fa/PersianCharFilter.cs               |   3 +-
 .../Analysis/Fa/PersianCharFilterFactory.cs        |   3 +-
 .../Analysis/Fa/PersianNormalizationFilter.cs      |   3 +-
 .../Fa/PersianNormalizationFilterFactory.cs        |   3 +-
 .../Analysis/Fa/PersianNormalizer.cs               |   3 +-
 .../Analysis/Fi/FinnishAnalyzer.cs                 |   3 +-
 .../Analysis/Fi/FinnishLightStemFilter.cs          |   3 +-
 .../Analysis/Fi/FinnishLightStemFilterFactory.cs   |   3 +-
 .../Analysis/Fi/FinnishLightStemmer.cs             |   3 +-
 .../Analysis/Fr/FrenchAnalyzer.cs                  |   3 +-
 .../Analysis/Fr/FrenchLightStemFilter.cs           |   3 +-
 .../Analysis/Fr/FrenchLightStemFilterFactory.cs    |   3 +-
 .../Analysis/Fr/FrenchLightStemmer.cs              |   3 +-
 .../Analysis/Fr/FrenchMinimalStemFilter.cs         |   3 +-
 .../Analysis/Fr/FrenchMinimalStemFilterFactory.cs  |   3 +-
 .../Analysis/Fr/FrenchMinimalStemmer.cs            |   3 +-
 .../Analysis/Fr/FrenchStemFilter.cs                |   3 +-
 .../Analysis/Fr/FrenchStemmer.cs                   |   3 +-
 .../Analysis/Ga/IrishAnalyzer.cs                   |   3 +-
 .../Analysis/Ga/IrishLowerCaseFilter.cs            |   3 +-
 .../Analysis/Ga/IrishLowerCaseFilterFactory.cs     |   3 +-
 .../Analysis/Gl/GalicianAnalyzer.cs                |   3 +-
 .../Analysis/Gl/GalicianMinimalStemFilter.cs       |   3 +-
 .../Gl/GalicianMinimalStemFilterFactory.cs         |   3 +-
 .../Analysis/Gl/GalicianMinimalStemmer.cs          |   3 +-
 .../Analysis/Gl/GalicianStemFilter.cs              |   3 +-
 .../Analysis/Gl/GalicianStemFilterFactory.cs       |   3 +-
 .../Analysis/Gl/GalicianStemmer.cs                 |   3 +-
 .../Analysis/Hi/HindiAnalyzer.cs                   |   3 +-
 .../Analysis/Hi/HindiNormalizationFilter.cs        |   3 +-
 .../Analysis/Hi/HindiNormalizationFilterFactory.cs |   3 +-
 .../Analysis/Hi/HindiNormalizer.cs                 |   3 +-
 .../Analysis/Hi/HindiStemFilter.cs                 |   3 +-
 .../Analysis/Hi/HindiStemFilterFactory.cs          |   3 +-
 .../Analysis/Hi/HindiStemmer.cs                    |   3 +-
 .../Analysis/Hu/HungarianAnalyzer.cs               |   3 +-
 .../Analysis/Hu/HungarianLightStemFilter.cs        |   3 +-
 .../Analysis/Hu/HungarianLightStemFilterFactory.cs |   3 +-
 .../Analysis/Hu/HungarianLightStemmer.cs           |   3 +-
 .../Analysis/Hunspell/Dictionary.cs                | 464 ++++++++++++++++-----
 .../Analysis/Hunspell/HunspellStemFilter.cs        |   3 +-
 .../Analysis/Hunspell/HunspellStemFilterFactory.cs |   3 +-
 .../Analysis/Hunspell/ISO8859_14Decoder.cs         |   3 +-
 .../Analysis/Hunspell/Stemmer.cs                   | 316 ++++++++++++--
 .../Analysis/Hy/ArmenianAnalyzer.cs                |   3 +-
 .../Analysis/Id/IndonesianAnalyzer.cs              |   3 +-
 .../Analysis/Id/IndonesianStemFilter.cs            |   3 +-
 .../Analysis/Id/IndonesianStemFilterFactory.cs     |   3 +-
 .../Analysis/Id/IndonesianStemmer.cs               |   3 +-
 .../Analysis/In/IndicNormalizationFilter.cs        |   3 +-
 .../Analysis/In/IndicNormalizationFilterFactory.cs |   3 +-
 .../Analysis/In/IndicNormalizer.cs                 |   3 +-
 .../Analysis/In/IndicTokenizer.cs                  |   3 +-
 .../Analysis/It/ItalianAnalyzer.cs                 |   3 +-
 .../Analysis/It/ItalianLightStemFilter.cs          |   3 +-
 .../Analysis/It/ItalianLightStemFilterFactory.cs   |   3 +-
 .../Analysis/It/ItalianLightStemmer.cs             |   3 +-
 .../Analysis/Lv/LatvianAnalyzer.cs                 |   3 +-
 .../Analysis/Lv/LatvianStemFilter.cs               |   3 +-
 .../Analysis/Lv/LatvianStemFilterFactory.cs        |   3 +-
 .../Analysis/Lv/LatvianStemmer.cs                  |   3 +-
 .../Analysis/Miscellaneous/ASCIIFoldingFilter.cs   |   3 +-
 .../Miscellaneous/ASCIIFoldingFilterFactory.cs     |   3 +-
 .../Analysis/Miscellaneous/CapitalizationFilter.cs |   3 +-
 .../Miscellaneous/CapitalizationFilterFactory.cs   |   3 +-
 .../Analysis/Miscellaneous/CodepointCountFilter.cs |   3 +-
 .../Miscellaneous/CodepointCountFilterFactory.cs   |   3 +-
 .../Analysis/Miscellaneous/EmptyTokenStream.cs     |   3 +-
 .../Miscellaneous/HyphenatedWordsFilter.cs         |   3 +-
 .../Miscellaneous/HyphenatedWordsFilterFactory.cs  |   3 +-
 .../Analysis/Miscellaneous/KeepWordFilter.cs       |   3 +-
 .../Miscellaneous/KeepWordFilterFactory.cs         |   3 +-
 .../Analysis/Miscellaneous/KeywordMarkerFilter.cs  |   3 +-
 .../Miscellaneous/KeywordMarkerFilterFactory.cs    |   3 +-
 .../Analysis/Miscellaneous/KeywordRepeatFilter.cs  |   3 +-
 .../Miscellaneous/KeywordRepeatFilterFactory.cs    |   3 +-
 .../Analysis/Miscellaneous/LengthFilter.cs         |   3 +-
 .../Analysis/Miscellaneous/LengthFilterFactory.cs  |   3 +-
 .../Miscellaneous/LimitTokenCountAnalyzer.cs       |   3 +-
 .../Miscellaneous/LimitTokenCountFilter.cs         |   3 +-
 .../Miscellaneous/LimitTokenCountFilterFactory.cs  |   3 +-
 .../Miscellaneous/LimitTokenPositionFilter.cs      |   3 +-
 .../LimitTokenPositionFilterFactory.cs             |   3 +-
 .../Miscellaneous/Lucene47WordDelimiterFilter.cs   |   3 +-
 .../Analysis/Miscellaneous/PatternAnalyzer.cs      |   3 +-
 .../Miscellaneous/PatternKeywordMarkerFilter.cs    |   3 +-
 .../Miscellaneous/PerFieldAnalyzerWrapper.cs       |   3 +-
 .../PrefixAndSuffixAwareTokenFilter.cs             |   3 +-
 .../Miscellaneous/PrefixAwareTokenFilter.cs        |   3 +-
 .../Miscellaneous/RemoveDuplicatesTokenFilter.cs   |   3 +-
 .../RemoveDuplicatesTokenFilterFactory.cs          |   3 +-
 .../Miscellaneous/ScandinavianFoldingFilter.cs     |   3 +-
 .../ScandinavianFoldingFilterFactory.cs            |   3 +-
 .../ScandinavianNormalizationFilter.cs             |   3 +-
 .../ScandinavianNormalizationFilterFactory.cs      |   3 +-
 .../Miscellaneous/SetKeywordMarkerFilter.cs        |   3 +-
 .../Miscellaneous/SingleTokenTokenStream.cs        |   3 +-
 .../Miscellaneous/StemmerOverrideFilter.cs         |   3 +-
 .../Miscellaneous/StemmerOverrideFilterFactory.cs  |   3 +-
 .../Analysis/Miscellaneous/TrimFilter.cs           |   3 +-
 .../Analysis/Miscellaneous/TrimFilterFactory.cs    |   3 +-
 .../Analysis/Miscellaneous/TruncateTokenFilter.cs  |   3 +-
 .../Miscellaneous/TruncateTokenFilterFactory.cs    |   3 +-
 .../Analysis/Miscellaneous/WordDelimiterFilter.cs  |   3 +-
 .../Miscellaneous/WordDelimiterFilterFactory.cs    |   3 +-
 .../Miscellaneous/WordDelimiterIterator.cs         |   3 +-
 .../Analysis/NGram/EdgeNGramFilterFactory.cs       |   3 +-
 .../Analysis/NGram/EdgeNGramTokenFilter.cs         |   3 +-
 .../Analysis/NGram/EdgeNGramTokenizer.cs           |   3 +-
 .../Analysis/NGram/EdgeNGramTokenizerFactory.cs    |   3 +-
 .../Analysis/NGram/Lucene43EdgeNGramTokenizer.cs   |   3 +-
 .../Analysis/NGram/Lucene43NGramTokenizer.cs       |   3 +-
 .../Analysis/NGram/NGramFilterFactory.cs           |   3 +-
 .../Analysis/NGram/NGramTokenFilter.cs             |   3 +-
 .../Analysis/NGram/NGramTokenizer.cs               |   3 +-
 .../Analysis/NGram/NGramTokenizerFactory.cs        |   3 +-
 .../Analysis/Nl/DutchAnalyzer.cs                   |   3 +-
 .../Analysis/Nl/DutchStemFilter.cs                 |   3 +-
 .../Analysis/Nl/DutchStemmer.cs                    |   3 +-
 .../Analysis/No/NorwegianAnalyzer.cs               |   3 +-
 .../Analysis/No/NorwegianLightStemFilter.cs        |   3 +-
 .../Analysis/No/NorwegianLightStemFilterFactory.cs |   3 +-
 .../Analysis/No/NorwegianLightStemmer.cs           |   3 +-
 .../Analysis/No/NorwegianMinimalStemFilter.cs      |   3 +-
 .../No/NorwegianMinimalStemFilterFactory.cs        |   3 +-
 .../Analysis/No/NorwegianMinimalStemmer.cs         |   3 +-
 .../Analysis/Path/PathHierarchyTokenizer.cs        |   3 +-
 .../Analysis/Path/PathHierarchyTokenizerFactory.cs |   3 +-
 .../Analysis/Path/ReversePathHierarchyTokenizer.cs |   3 +-
 .../Pattern/PatternCaptureGroupFilterFactory.cs    |   3 +-
 .../Pattern/PatternCaptureGroupTokenFilter.cs      |   3 +-
 .../Analysis/Pattern/PatternReplaceCharFilter.cs   |   3 +-
 .../Pattern/PatternReplaceCharFilterFactory.cs     |   3 +-
 .../Analysis/Pattern/PatternReplaceFilter.cs       |   3 +-
 .../Pattern/PatternReplaceFilterFactory.cs         |   3 +-
 .../Analysis/Pattern/PatternTokenizer.cs           |   3 +-
 .../Analysis/Pattern/PatternTokenizerFactory.cs    |   3 +-
 .../Analysis/Payloads/AbstractEncoder.cs           |   3 +-
 .../Payloads/DelimitedPayloadTokenFilter.cs        |   3 +-
 .../Payloads/DelimitedPayloadTokenFilterFactory.cs |   3 +-
 .../Analysis/Payloads/FloatEncoder.cs              |   3 +-
 .../Analysis/Payloads/IdentityEncoder.cs           |   3 +-
 .../Analysis/Payloads/IntegerEncoder.cs            |   3 +-
 .../Analysis/Payloads/NumericPayloadTokenFilter.cs |   3 +-
 .../Payloads/NumericPayloadTokenFilterFactory.cs   |   3 +-
 .../Analysis/Payloads/PayloadEncoder.cs            |   3 +-
 .../Analysis/Payloads/PayloadHelper.cs             |   3 +-
 .../Payloads/TokenOffsetPayloadTokenFilter.cs      |   3 +-
 .../TokenOffsetPayloadTokenFilterFactory.cs        |   3 +-
 .../Analysis/Payloads/TypeAsPayloadTokenFilter.cs  |   3 +-
 .../Payloads/TypeAsPayloadTokenFilterFactory.cs    |   3 +-
 .../Analysis/Position/PositionFilter.cs            |   3 +-
 .../Analysis/Position/PositionFilterFactory.cs     |   3 +-
 .../Analysis/Pt/PortugueseAnalyzer.cs              |   3 +-
 .../Analysis/Pt/PortugueseLightStemFilter.cs       |   3 +-
 .../Pt/PortugueseLightStemFilterFactory.cs         |   3 +-
 .../Analysis/Pt/PortugueseLightStemmer.cs          |   3 +-
 .../Analysis/Pt/PortugueseMinimalStemFilter.cs     |   3 +-
 .../Pt/PortugueseMinimalStemFilterFactory.cs       |   3 +-
 .../Analysis/Pt/PortugueseMinimalStemmer.cs        |   3 +-
 .../Analysis/Pt/PortugueseStemFilter.cs            |   3 +-
 .../Analysis/Pt/PortugueseStemFilterFactory.cs     |   3 +-
 .../Analysis/Pt/PortugueseStemmer.cs               |   3 +-
 .../Analysis/Pt/RSLPStemmerBase.cs                 |   3 +-
 .../Analysis/Query/QueryAutoStopWordAnalyzer.cs    |   3 +-
 .../Analysis/Reverse/ReverseStringFilter.cs        |   3 +-
 .../Analysis/Reverse/ReverseStringFilterFactory.cs |   3 +-
 .../Analysis/Ro/RomanianAnalyzer.cs                |   3 +-
 .../Analysis/Ru/RussianAnalyzer.cs                 |   3 +-
 .../Analysis/Ru/RussianLetterTokenizer.cs          |   3 +-
 .../Analysis/Ru/RussianLetterTokenizerFactory.cs   |   3 +-
 .../Analysis/Ru/RussianLightStemFilter.cs          |   3 +-
 .../Analysis/Ru/RussianLightStemFilterFactory.cs   |   3 +-
 .../Analysis/Ru/RussianLightStemmer.cs             |   3 +-
 .../Analysis/Shingle/ShingleAnalyzerWrapper.cs     |   3 +-
 .../Analysis/Shingle/ShingleFilter.cs              |   3 +-
 .../Analysis/Shingle/ShingleFilterFactory.cs       |   3 +-
 .../Analysis/Sinks/DateRecognizerSinkFilter.cs     |   3 +-
 .../Analysis/Sinks/TeeSinkTokenFilter.cs           |   3 +-
 .../Analysis/Sinks/TokenRangeSinkFilter.cs         |   3 +-
 .../Analysis/Sinks/TokenTypeSinkFilter.cs          |   3 +-
 .../Analysis/Snowball/SnowballAnalyzer.cs          |   3 +-
 .../Analysis/Snowball/SnowballFilter.cs            |   3 +-
 .../Snowball/SnowballPorterFilterFactory.cs        |   3 +-
 .../Analysis/Standard/ClassicAnalyzer.cs           |   3 +-
 .../Analysis/Standard/ClassicFilter.cs             |   3 +-
 .../Analysis/Standard/ClassicFilterFactory.cs      |   3 +-
 .../Analysis/Standard/ClassicTokenizer.cs          |   3 +-
 .../Analysis/Standard/ClassicTokenizerFactory.cs   |   3 +-
 .../Analysis/Standard/ClassicTokenizerImpl.cs      |   3 +-
 .../Analysis/Standard/StandardAnalyzer.cs          |   3 +-
 .../Analysis/Standard/StandardFilter.cs            |   3 +-
 .../Analysis/Standard/StandardFilterFactory.cs     |   3 +-
 .../Analysis/Standard/StandardTokenizer.cs         |   3 +-
 .../Analysis/Standard/StandardTokenizerFactory.cs  |   3 +-
 .../Analysis/Standard/StandardTokenizerImpl.cs     |   3 +-
 .../Standard/StandardTokenizerInterface.cs         |   3 +-
 .../Standard/Std31/StandardTokenizerImpl31.cs      |   5 +-
 .../Standard/Std31/UAX29URLEmailTokenizerImpl31.cs |   3 +-
 .../Standard/Std34/StandardTokenizerImpl34.cs      |   5 +-
 .../Standard/Std34/UAX29URLEmailTokenizerImpl34.cs |   3 +-
 .../Standard/Std36/UAX29URLEmailTokenizerImpl36.cs |   3 +-
 .../Standard/Std40/StandardTokenizerImpl40.cs      |   5 +-
 .../Standard/Std40/UAX29URLEmailTokenizerImpl40.cs |   3 +-
 .../Analysis/Standard/UAX29URLEmailAnalyzer.cs     |   3 +-
 .../Analysis/Standard/UAX29URLEmailTokenizer.cs    |   3 +-
 .../Standard/UAX29URLEmailTokenizerFactory.cs      |   3 +-
 .../Standard/UAX29URLEmailTokenizerImpl.cs         |   3 +-
 .../Analysis/Sv/SwedishAnalyzer.cs                 |   3 +-
 .../Analysis/Sv/SwedishLightStemFilter.cs          |   3 +-
 .../Analysis/Sv/SwedishLightStemFilterFactory.cs   |   3 +-
 .../Analysis/Sv/SwedishLightStemmer.cs             |   3 +-
 .../Analysis/Synonym/FSTSynonymFilterFactory.cs    |   3 +-
 .../Analysis/Synonym/SlowSynonymFilter.cs          |   3 +-
 .../Analysis/Synonym/SlowSynonymFilterFactory.cs   |   3 +-
 .../Analysis/Synonym/SlowSynonymMap.cs             |   3 +-
 .../Analysis/Synonym/SolrSynonymParser.cs          |   3 +-
 .../Analysis/Synonym/SynonymFilter.cs              |   3 +-
 .../Analysis/Synonym/SynonymFilterFactory.cs       |   3 +-
 .../Analysis/Synonym/SynonymMap.cs                 |   3 +-
 .../Analysis/Synonym/WordnetSynonymParser.cs       |   3 +-
 .../Analysis/Th/ThaiAnalyzer.cs                    |   3 +-
 .../Analysis/Th/ThaiTokenizer.cs                   |   3 +-
 .../Analysis/Th/ThaiTokenizerFactory.cs            |   3 +-
 .../Analysis/Th/ThaiWordFilter.cs                  |   3 +-
 .../Analysis/Th/ThaiWordFilterFactory.cs           |   3 +-
 .../Analysis/Tr/ApostropheFilter.cs                |   3 +-
 .../Analysis/Tr/ApostropheFilterFactory.cs         |   3 +-
 .../Analysis/Tr/TurkishAnalyzer.cs                 |   3 +-
 .../Analysis/Tr/TurkishLowerCaseFilter.cs          |   3 +-
 .../Analysis/Tr/TurkishLowerCaseFilterFactory.cs   |   3 +-
 .../Analysis/Util/AbstractAnalysisFactory.cs       |   3 +-
 .../Analysis/Util/AnalysisSPILoader.cs             |   3 +-
 .../Analysis/Util/BufferedCharFilter.cs            |   3 +-
 .../Analysis/Util/CharArrayIterator.cs             |   3 +-
 .../Analysis/Util/CharArrayMap.cs                  |   3 +-
 .../Analysis/Util/CharArraySet.cs                  |   3 +-
 .../Analysis/Util/CharFilterFactory.cs             |   3 +-
 .../Analysis/Util/CharTokenizer.cs                 |   3 +-
 .../Analysis/Util/CharacterUtils.cs                |   3 +-
 .../Analysis/Util/ClasspathResourceLoader.cs       |   3 +-
 .../Analysis/Util/ElisionFilter.cs                 |   3 +-
 .../Analysis/Util/ElisionFilterFactory.cs          |   3 +-
 .../Analysis/Util/FilesystemResourceLoader.cs      |   3 +-
 .../Analysis/Util/FilteringTokenFilter.cs          |   3 +-
 .../Analysis/Util/MultiTermAwareComponent.cs       |   3 +-
 .../Analysis/Util/OpenStringBuilder.cs             |   3 +-
 .../Analysis/Util/ResourceLoader.cs                |   3 +-
 .../Analysis/Util/ResourceLoaderAware.cs           |   3 +-
 .../Analysis/Util/RollingCharBuffer.cs             |   3 +-
 .../Analysis/Util/SegmentingTokenizerBase.cs       |   3 +-
 .../Analysis/Util/StemmerUtil.cs                   |   3 +-
 .../Analysis/Util/StopwordAnalyzerBase.cs          |   3 +-
 .../Analysis/Util/TokenFilterFactory.cs            |   3 +-
 .../Analysis/Util/TokenizerFactory.cs              |   3 +-
 .../Analysis/Util/WordlistLoader.cs                |   3 +-
 .../Analysis/Wikipedia/WikipediaTokenizer.cs       |   3 +-
 .../Wikipedia/WikipediaTokenizerFactory.cs         |   3 +-
 .../Analysis/Wikipedia/WikipediaTokenizerImpl.cs   |   5 +-
 .../Collation/CollationAttributeFactory.cs         |   3 +-
 .../Collation/CollationKeyAnalyzer.cs              |   3 +-
 .../Collation/CollationKeyFilter.cs                |   3 +-
 .../Collation/CollationKeyFilterFactory.cs         |   3 +-
 .../TokenAttributes/CollatedTermAttributeImpl.cs   |   3 +-
 .../Tartarus/Snowball/Among.cs                     |   5 +-
 .../Tartarus/Snowball/Ext/ArmenianStemmer.cs       |   5 +-
 .../Tartarus/Snowball/Ext/BasqueStemmer.cs         |   5 +-
 .../Tartarus/Snowball/Ext/CatalanStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/DanishStemmer.cs         |   5 +-
 .../Tartarus/Snowball/Ext/DutchStemmer.cs          |   5 +-
 .../Tartarus/Snowball/Ext/EnglishStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/FinnishStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/FrenchStemmer.cs         |   5 +-
 .../Tartarus/Snowball/Ext/German2Stemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/GermanStemmer.cs         |   5 +-
 .../Tartarus/Snowball/Ext/HungarianStemmer.cs      |   5 +-
 .../Tartarus/Snowball/Ext/IrishStemmer.cs          |   5 +-
 .../Tartarus/Snowball/Ext/ItalianStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/KpStemmer.cs             |   5 +-
 .../Tartarus/Snowball/Ext/LovinsStemmer.cs         |   5 +-
 .../Tartarus/Snowball/Ext/NorwegianStemmer.cs      |   5 +-
 .../Tartarus/Snowball/Ext/PorterStemmer.cs         |   5 +-
 .../Tartarus/Snowball/Ext/PortugueseStemmer.cs     |   5 +-
 .../Tartarus/Snowball/Ext/RomanianStemmer.cs       |   5 +-
 .../Tartarus/Snowball/Ext/RussianStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/SpanishStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/SwedishStemmer.cs        |   5 +-
 .../Tartarus/Snowball/Ext/TurkishStemmer.cs        |   5 +-
 .../Tartarus/Snowball/SnowballProgram.cs           |   5 +-
 .../Analysis/Ar/TestArabicAnalyzer.cs              |   3 +-
 .../Analysis/Ar/TestArabicFilters.cs               |   3 +-
 .../Analysis/Ar/TestArabicLetterTokenizer.cs       |   3 +-
 .../Analysis/Ar/TestArabicNormalizationFilter.cs   |   3 +-
 .../Analysis/Ar/TestArabicStemFilter.cs            |   3 +-
 .../Analysis/Bg/TestBulgarianAnalyzer.cs           |   3 +-
 .../Analysis/Bg/TestBulgarianStemFilterFactory.cs  |   3 +-
 .../Analysis/Bg/TestBulgarianStemmer.cs            |   3 +-
 .../Analysis/Br/TestBrazilianStemFilterFactory.cs  |   3 +-
 .../Analysis/Br/TestBrazilianStemmer.cs            |   3 +-
 .../Analysis/Ca/TestCatalanAnalyzer.cs             |   3 +-
 .../CharFilters/HTMLStripCharFilterTest.cs         |   1 +
 .../CharFilters/TestHTMLStripCharFilterFactory.cs  |   3 +-
 .../Analysis/CharFilters/TestMappingCharFilter.cs  |   3 +-
 .../CharFilters/TestMappingCharFilterFactory.cs    |   3 +-
 .../Analysis/Cjk/TestCJKAnalyzer.cs                |   3 +-
 .../Analysis/Cjk/TestCJKBigramFilter.cs            |   3 +-
 .../Analysis/Cjk/TestCJKBigramFilterFactory.cs     |   3 +-
 .../Analysis/Cjk/TestCJKTokenizer.cs               |   3 +-
 .../Analysis/Cjk/TestCJKTokenizerFactory.cs        |   3 +-
 .../Analysis/Cjk/TestCJKWidthFilter.cs             |   3 +-
 .../Analysis/Cjk/TestCJKWidthFilterFactory.cs      |   3 +-
 .../Analysis/Ckb/TestSoraniAnalyzer.cs             |   3 +-
 .../Analysis/Ckb/TestSoraniNormalizationFilter.cs  |   3 +-
 .../Ckb/TestSoraniNormalizationFilterFactory.cs    |   3 +-
 .../Analysis/Ckb/TestSoraniStemFilter.cs           |   3 +-
 .../Analysis/Ckb/TestSoraniStemFilterFactory.cs    |   3 +-
 .../Analysis/Cn/TestChineseFilterFactory.cs        |   3 +-
 .../Analysis/Cn/TestChineseTokenizer.cs            |   3 +-
 .../Analysis/Cn/TestChineseTokenizerFactory.cs     |   3 +-
 .../Analysis/Commongrams/CommonGramsFilterTest.cs  |   3 +-
 .../Commongrams/TestCommonGramsFilterFactory.cs    |   3 +-
 .../TestCommonGramsQueryFilterFactory.cs           |   3 +-
 .../Compound/TestCompoundWordTokenFilter.cs        |   3 +-
 ...TestDictionaryCompoundWordTokenFilterFactory.cs |   3 +-
 ...estHyphenationCompoundWordTokenFilterFactory.cs |   3 +-
 .../Analysis/Core/TestAllAnalyzersHaveFactories.cs |   3 +-
 .../Analysis/Core/TestAnalyzers.cs                 |   3 +-
 .../Analysis/Core/TestBugInSomething.cs            |   3 +-
 .../Analysis/Core/TestClassicAnalyzer.cs           |   3 +-
 .../Analysis/Core/TestDuelingAnalyzers.cs          |   3 +-
 .../Analysis/Core/TestFactories.cs                 |   3 +-
 .../Analysis/Core/TestKeywordAnalyzer.cs           |   3 +-
 .../Analysis/Core/TestRandomChains.cs              |   3 +-
 .../Analysis/Core/TestStandardAnalyzer.cs          |   3 +-
 .../Analysis/Core/TestStopAnalyzer.cs              |   3 +-
 .../Analysis/Core/TestStopFilter.cs                |   3 +-
 .../Analysis/Core/TestStopFilterFactory.cs         |   3 +-
 .../Analysis/Core/TestTypeTokenFilter.cs           |   3 +-
 .../Analysis/Core/TestTypeTokenFilterFactory.cs    |   3 +-
 .../Analysis/Core/TestUAX29URLEmailAnalyzer.cs     |   3 +-
 .../Analysis/Core/TestUAX29URLEmailTokenizer.cs    |   3 +-
 .../Analysis/Core/WordBreakTestUnicode_6_3_0.cs    |   3 +-
 .../Analysis/Cz/TestCzechAnalyzer.cs               |   3 +-
 .../Analysis/Cz/TestCzechStemFilterFactory.cs      |   3 +-
 .../Analysis/Cz/TestCzechStemmer.cs                |   3 +-
 .../Analysis/Da/TestDanishAnalyzer.cs              |   3 +-
 .../Analysis/De/TestGermanAnalyzer.cs              |   3 +-
 .../Analysis/De/TestGermanLightStemFilter.cs       |   3 +-
 .../De/TestGermanLightStemFilterFactory.cs         |   3 +-
 .../Analysis/De/TestGermanMinimalStemFilter.cs     |   3 +-
 .../De/TestGermanMinimalStemFilterFactory.cs       |   3 +-
 .../Analysis/De/TestGermanNormalizationFilter.cs   |   3 +-
 .../De/TestGermanNormalizationFilterFactory.cs     |   3 +-
 .../Analysis/De/TestGermanStemFilter.cs            |   3 +-
 .../Analysis/De/TestGermanStemFilterFactory.cs     |   3 +-
 .../Analysis/El/GreekAnalyzerTest.cs               |   3 +-
 .../Analysis/El/TestGreekLowerCaseFilterFactory.cs |   3 +-
 .../Analysis/El/TestGreekStemFilterFactory.cs      |   3 +-
 .../Analysis/El/TestGreekStemmer.cs                |   3 +-
 .../Analysis/En/TestEnglishAnalyzer.cs             |   3 +-
 .../Analysis/En/TestEnglishMinimalStemFilter.cs    |   3 +-
 .../En/TestEnglishMinimalStemFilterFactory.cs      |   3 +-
 .../Analysis/En/TestKStemFilterFactory.cs          |   3 +-
 .../Analysis/En/TestKStemmer.cs                    |   3 +-
 .../Analysis/En/TestPorterStemFilter.cs            |   3 +-
 .../Analysis/En/TestPorterStemFilterFactory.cs     |   3 +-
 .../Analysis/Es/TestSpanishAnalyzer.cs             |   3 +-
 .../Analysis/Es/TestSpanishLightStemFilter.cs      |   3 +-
 .../Es/TestSpanishLightStemFilterFactory.cs        |   3 +-
 .../Analysis/Eu/TestBasqueAnalyzer.cs              |   3 +-
 .../Analysis/Fa/TestPersianAnalyzer.cs             |   3 +-
 .../Analysis/Fa/TestPersianCharFilter.cs           |   3 +-
 .../Analysis/Fa/TestPersianNormalizationFilter.cs  |   3 +-
 .../Fa/TestPersianNormalizationFilterFactory.cs    |   3 +-
 .../Analysis/Fi/TestFinnishAnalyzer.cs             |   3 +-
 .../Analysis/Fi/TestFinnishLightStemFilter.cs      |   3 +-
 .../Fi/TestFinnishLightStemFilterFactory.cs        |   3 +-
 .../Analysis/Fr/TestFrenchAnalyzer.cs              |   3 +-
 .../Analysis/Fr/TestFrenchLightStemFilter.cs       |   3 +-
 .../Fr/TestFrenchLightStemFilterFactory.cs         |   3 +-
 .../Analysis/Fr/TestFrenchMinimalStemFilter.cs     |   3 +-
 .../Fr/TestFrenchMinimalStemFilterFactory.cs       |   3 +-
 .../Analysis/Ga/TestIrishAnalyzer.cs               |   3 +-
 .../Analysis/Ga/TestIrishLowerCaseFilter.cs        |   3 +-
 .../Analysis/Ga/TestIrishLowerCaseFilterFactory.cs |   3 +-
 .../Analysis/Gl/TestGalicianAnalyzer.cs            |   3 +-
 .../Analysis/Gl/TestGalicianMinimalStemFilter.cs   |   3 +-
 .../Gl/TestGalicianMinimalStemFilterFactory.cs     |   3 +-
 .../Analysis/Gl/TestGalicianStemFilter.cs          |   3 +-
 .../Analysis/Gl/TestGalicianStemFilterFactory.cs   |   3 +-
 .../Analysis/Hi/TestHindiAnalyzer.cs               |   3 +-
 .../Analysis/Hi/TestHindiFilters.cs                |   3 +-
 .../Analysis/Hi/TestHindiNormalizer.cs             |   3 +-
 .../Analysis/Hi/TestHindiStemmer.cs                |   3 +-
 .../Analysis/Hu/TestHungarianAnalyzer.cs           |   3 +-
 .../Analysis/Hu/TestHungarianLightStemFilter.cs    |   3 +-
 .../Hu/TestHungarianLightStemFilterFactory.cs      |   3 +-
 .../Analysis/Hunspell/Foo.cs                       |  12 +
 .../Analysis/Hunspell/StemmerTestBase.cs           |   3 +-
 .../Analysis/Hunspell/Test64kAffixes.cs            |  69 +++
 .../Analysis/Hunspell/TestAllDictionaries.cs       |   7 +-
 .../Analysis/Hunspell/TestAllDictionaries2.cs      |  18 +-
 .../Analysis/Hunspell/TestAlternateCasing.cs       |  67 +++
 .../Analysis/Hunspell/TestCaseInsensitive.cs       |   3 +-
 .../Analysis/Hunspell/TestCaseSensitive.cs         |  71 ++++
 .../Analysis/Hunspell/TestCircumfix.cs             |   3 +-
 .../Analysis/Hunspell/TestComplexPrefix.cs         |   3 +-
 .../Analysis/Hunspell/TestCondition.cs             |   3 +-
 .../{TestHomonyms.cs => TestCondition2.cs}         |  16 +-
 .../{TestMorph.cs => TestConditionGH418.cs}        |  19 +-
 .../Analysis/Hunspell/TestConv.cs                  |   3 +-
 .../Analysis/Hunspell/TestDependencies.cs          |   3 +-
 .../Analysis/Hunspell/TestDictionary.cs            |   4 +-
 .../{TestHomonyms.cs => TestDoubleEscape.cs}       |  16 +-
 .../Analysis/Hunspell/TestEscaped.cs               |   3 +-
 .../Analysis/Hunspell/TestFlagLong.cs              |   4 +-
 .../Analysis/Hunspell/TestFlagNum.cs               |   3 +-
 .../Hunspell/{TestHomonyms.cs => TestFullStrip.cs} |  16 +-
 .../Analysis/Hunspell/TestHomonyms.cs              |   3 +-
 .../Analysis/Hunspell/TestHunspellStemFilter.cs    |   3 +-
 .../Hunspell/TestHunspellStemFilterFactory.cs      |   3 +-
 .../Analysis/Hunspell/TestIgnore.cs                |   3 +-
 .../{TestTwoSuffixes.cs => TestKeepCase.cs}        |  29 +-
 .../Analysis/Hunspell/TestMorph.cs                 |   3 +-
 .../{TestCircumfix.cs => TestMorphAlias.cs}        |  27 +-
 .../{TestCircumfix.cs => TestMorphData.cs}         |  27 +-
 .../{TestTwoSuffixes.cs => TestNeedAffix.cs}       |  25 +-
 .../{TestTwoSuffixes.cs => TestOnlyInCompound.cs}  |  21 +-
 .../Analysis/Hunspell/TestOptionalCondition.cs     |   3 +-
 .../{TestDependencies.cs => TestSpaces.cs}         |  34 +-
 .../Analysis/Hunspell/TestStemmer.cs               |   3 +-
 .../{TestMorph.cs => TestStrangeOvergeneration.cs} |  21 +-
 .../Analysis/Hunspell/TestTwoFold.cs               |   3 +-
 .../Analysis/Hunspell/TestTwoSuffixes.cs           |   3 +-
 .../Hunspell/{TestHomonyms.cs => TestZeroAffix.cs} |  16 +-
 .../{TestHomonyms.cs => TestZeroAffix2.cs}         |  16 +-
 .../Analysis/Hunspell/alternate-casing.aff         |  15 +
 .../Analysis/Hunspell/alternate-casing.dic         |   4 +
 .../Analysis/Hunspell/casesensitive.aff            |  16 +
 .../Analysis/Hunspell/casesensitive.dic            |   4 +
 .../Analysis/Hunspell/circumfix.dic                |   2 +-
 .../Analysis/Hunspell/condition-issue-418.aff      |   8 +
 .../Analysis/Hunspell/condition-issue-418.dic      |   2 +
 .../Analysis/Hunspell/condition2.aff               |   5 +
 .../Analysis/Hunspell/condition2.dic               |   2 +
 .../Analysis/Hunspell/conv.dic                     |   2 +-
 .../Analysis/Hunspell/dependencies.dic             |   4 +-
 .../Analysis/Hunspell/double-escaped.aff           |   5 +
 .../Analysis/Hunspell/double-escaped.dic           |   2 +
 .../Analysis/Hunspell/flaglong.aff                 |   3 +
 .../Analysis/Hunspell/fullstrip.aff                |   6 +
 .../Analysis/Hunspell/fullstrip.dic                |   2 +
 .../Analysis/Hunspell/homonyms.dic                 |   4 +-
 .../Analysis/Hunspell/ignore.dic                   |   4 +-
 .../Analysis/Hunspell/keepcase.aff                 |   6 +
 .../Analysis/Hunspell/keepcase.dic                 |   4 +
 .../Analysis/Hunspell/morph.dic                    |   2 +-
 .../Analysis/Hunspell/morphalias.aff               |  16 +
 .../Analysis/Hunspell/morphalias.dic               |   6 +
 .../Analysis/Hunspell/morphdata.aff                |  10 +
 .../Analysis/Hunspell/morphdata.dic                |   6 +
 .../Analysis/Hunspell/needaffix.aff                |   9 +
 .../Analysis/Hunspell/needaffix.dic                |   4 +
 .../Analysis/Hunspell/onlyincompound.aff           |  12 +
 .../Analysis/Hunspell/onlyincompound.dic           |   4 +
 .../Analysis/Hunspell/spaces.aff                   |   5 +
 .../Analysis/Hunspell/spaces.dic                   |   9 +
 .../Analysis/Hunspell/strange-overgeneration.aff   |  10 +
 .../Analysis/Hunspell/strange-overgeneration.dic   |   5 +
 .../Analysis/Hunspell/twosuffixes.dic              |   2 +-
 .../Analysis/Hunspell/zeroaffix.aff                |   4 +
 .../Analysis/Hunspell/zeroaffix.dic                |   2 +
 .../Analysis/Hunspell/zeroaffix2.aff               |   6 +
 .../Analysis/Hunspell/zeroaffix2.dic               |   2 +
 .../Analysis/Hy/TestArmenianAnalyzer.cs            |   3 +-
 .../Analysis/Id/TestIndonesianAnalyzer.cs          |   3 +-
 .../Analysis/Id/TestIndonesianStemFilterFactory.cs |   3 +-
 .../Analysis/Id/TestIndonesianStemmer.cs           |   3 +-
 .../Analysis/In/TestIndicNormalizer.cs             |   3 +-
 .../Analysis/It/TestItalianAnalyzer.cs             |   3 +-
 .../Analysis/It/TestItalianLightStemFilter.cs      |   3 +-
 .../It/TestItalianLightStemFilterFactory.cs        |   3 +-
 .../Analysis/Lv/TestLatvianAnalyzer.cs             |   3 +-
 .../Analysis/Lv/TestLatvianStemFilterFactory.cs    |   3 +-
 .../Analysis/Lv/TestLatvianStemmer.cs              |   3 +-
 .../Analysis/Miscellaneous/PatternAnalyzerTest.cs  |   3 +-
 .../Miscellaneous/TestASCIIFoldingFilter.cs        |   3 +-
 .../Miscellaneous/TestCapitalizationFilter.cs      |   3 +-
 .../TestCapitalizationFilterFactory.cs             |   3 +-
 .../Miscellaneous/TestCodepointCountFilter.cs      |   3 +-
 .../TestCodepointCountFilterFactory.cs             |   3 +-
 .../Analysis/Miscellaneous/TestEmptyTokenStream.cs |   3 +-
 .../Miscellaneous/TestHyphenatedWordsFilter.cs     |   3 +-
 .../Miscellaneous/TestKeepFilterFactory.cs         |   3 +-
 .../Analysis/Miscellaneous/TestKeepWordFilter.cs   |   3 +-
 .../Miscellaneous/TestKeywordMarkerFilter.cs       |   3 +-
 .../TestKeywordMarkerFilterFactory.cs              |   3 +-
 .../Miscellaneous/TestKeywordRepeatFilter.cs       |   3 +-
 .../Analysis/Miscellaneous/TestLengthFilter.cs     |   3 +-
 .../Miscellaneous/TestLengthFilterFactory.cs       |   3 +-
 .../Miscellaneous/TestLimitTokenCountAnalyzer.cs   |   3 +-
 .../Miscellaneous/TestLimitTokenCountFilter.cs     |   3 +-
 .../TestLimitTokenCountFilterFactory.cs            |   3 +-
 .../Miscellaneous/TestLimitTokenPositionFilter.cs  |   3 +-
 .../TestLimitTokenPositionFilterFactory.cs         |   3 +-
 .../TestLucene47WordDelimiterFilter.cs             |   3 +-
 .../Miscellaneous/TestPerFieldAnalyzerWrapper.cs   |   3 +-
 .../TestPrefixAndSuffixAwareTokenFilter.cs         |   3 +-
 .../Miscellaneous/TestPrefixAwareTokenFilter.cs    |   3 +-
 .../TestRemoveDuplicatesTokenFilter.cs             |   3 +-
 .../TestRemoveDuplicatesTokenFilterFactory.cs      |   3 +-
 .../Miscellaneous/TestScandinavianFoldingFilter.cs |   3 +-
 .../TestScandinavianFoldingFilterFactory.cs        |   3 +-
 .../TestScandinavianNormalizationFilter.cs         |   3 +-
 .../TestScandinavianNormalizationFilterFactory.cs  |   3 +-
 .../Miscellaneous/TestSingleTokenTokenFilter.cs    |   3 +-
 .../Miscellaneous/TestStemmerOverrideFilter.cs     |   3 +-
 .../TestStemmerOverrideFilterFactory.cs            |   3 +-
 .../Analysis/Miscellaneous/TestTrimFilter.cs       |   3 +-
 .../Miscellaneous/TestTrimFilterFactory.cs         |   3 +-
 .../Miscellaneous/TestTruncateTokenFilter.cs       |   3 +-
 .../TestTruncateTokenFilterFactory.cs              |   3 +-
 .../Miscellaneous/TestWordDelimiterFilter.cs       |   3 +-
 .../Analysis/NGram/EdgeNGramTokenFilterTest.cs     |   3 +-
 .../Analysis/NGram/EdgeNGramTokenizerTest.cs       |   3 +-
 .../Analysis/NGram/NGramTokenFilterTest.cs         |   3 +-
 .../Analysis/NGram/NGramTokenizerTest.cs           |   3 +-
 .../Analysis/NGram/TestNGramFilters.cs             |   3 +-
 .../Analysis/Nl/TestDutchStemmer.cs                |   3 +-
 .../Analysis/No/TestNorwegianAnalyzer.cs           |   3 +-
 .../Analysis/No/TestNorwegianLightStemFilter.cs    |   3 +-
 .../No/TestNorwegianLightStemFilterFactory.cs      |   3 +-
 .../Analysis/No/TestNorwegianMinimalStemFilter.cs  |   3 +-
 .../No/TestNorwegianMinimalStemFilterFactory.cs    |   3 +-
 .../Analysis/Path/TestPathHierarchyTokenizer.cs    |   3 +-
 .../Path/TestReversePathHierarchyTokenizer.cs      |   3 +-
 .../Pattern/TestPatternCaptureGroupTokenFilter.cs  |   3 +-
 .../Pattern/TestPatternReplaceCharFilter.cs        |   3 +-
 .../Pattern/TestPatternReplaceCharFilterFactory.cs |   3 +-
 .../Analysis/Pattern/TestPatternReplaceFilter.cs   |   3 +-
 .../Pattern/TestPatternReplaceFilterFactory.cs     |   3 +-
 .../Analysis/Pattern/TestPatternTokenizer.cs       |   3 +-
 .../Pattern/TestPatternTokenizerFactory.cs         |   3 +-
 .../Payloads/DelimitedPayloadTokenFilterTest.cs    |   3 +-
 .../Payloads/NumericPayloadTokenFilterTest.cs      |   3 +-
 .../TestDelimitedPayloadTokenFilterFactory.cs      |   3 +-
 .../Payloads/TokenOffsetPayloadTokenFilterTest.cs  |   3 +-
 .../Payloads/TypeAsPayloadTokenFilterTest.cs       |   3 +-
 .../Analysis/Position/PositionFilterTest.cs        |   3 +-
 .../Analysis/Pt/TestPortugueseAnalyzer.cs          |   3 +-
 .../Analysis/Pt/TestPortugueseLightStemFilter.cs   |   3 +-
 .../Pt/TestPortugueseLightStemFilterFactory.cs     |   3 +-
 .../Analysis/Pt/TestPortugueseMinimalStemFilter.cs |   3 +-
 .../Pt/TestPortugueseMinimalStemFilterFactory.cs   |   3 +-
 .../Analysis/Pt/TestPortugueseStemFilter.cs        |   3 +-
 .../Analysis/Pt/TestPortugueseStemFilterFactory.cs |   3 +-
 .../Query/QueryAutoStopWordAnalyzerTest.cs         |   3 +-
 .../Analysis/Reverse/TestReverseStringFilter.cs    |   3 +-
 .../Reverse/TestReverseStringFilterFactory.cs      |   3 +-
 .../Analysis/Ro/TestRomanianAnalyzer.cs            |   3 +-
 .../Analysis/Ru/TestRussianAnalyzer.cs             |   3 +-
 .../Analysis/Ru/TestRussianFilters.cs              |   3 +-
 .../Analysis/Ru/TestRussianLetterTokenizer.cs      |   3 +-
 .../Analysis/Ru/TestRussianLightStemFilter.cs      |   3 +-
 .../Ru/TestRussianLightStemFilterFactory.cs        |   3 +-
 .../Analysis/Shingle/ShingleAnalyzerWrapperTest.cs |   3 +-
 .../Analysis/Shingle/ShingleFilterTest.cs          |   3 +-
 .../Analysis/Shingle/TestShingleFilterFactory.cs   |   3 +-
 .../Sinks/DateRecognizerSinkTokenizerTest.cs       |   3 +-
 .../Analysis/Sinks/TestTeeSinkTokenFilter.cs       |   3 +-
 .../Analysis/Sinks/TokenRangeSinkTokenizerTest.cs  |   3 +-
 .../Analysis/Sinks/TokenTypeSinkTokenizerTest.cs   |   3 +-
 .../Analysis/Snowball/TestSnowball.cs              |   3 +-
 .../Snowball/TestSnowballPorterFilterFactory.cs    |   3 +-
 .../Analysis/Snowball/TestSnowballVocab.cs         |   3 +-
 .../Analysis/Standard/TestStandardFactories.cs     |   3 +-
 .../Standard/TestUAX29URLEmailTokenizerFactory.cs  |   3 +-
 .../Analysis/Sv/TestSwedishAnalyzer.cs             |   3 +-
 .../Analysis/Sv/TestSwedishLightStemFilter.cs      |   3 +-
 .../Sv/TestSwedishLightStemFilterFactory.cs        |   3 +-
 .../Analysis/Synonym/TestMultiWordSynonyms.cs      |   3 +-
 .../Analysis/Synonym/TestSlowSynonymFilter.cs      |   3 +-
 .../Analysis/Synonym/TestSolrSynonymParser.cs      |   3 +-
 .../Analysis/Synonym/TestSynonymFilterFactory.cs   |   3 +-
 .../Analysis/Synonym/TestSynonymMap.cs             |   3 +-
 .../Analysis/Synonym/TestSynonymMapFilter.cs       |   3 +-
 .../Analysis/Synonym/TestWordnetSynonymParser.cs   |   3 +-
 .../Analysis/Th/TestThaiAnalyzer.cs                |   1 +
 .../Analysis/Th/TestThaiTokenizerFactory.cs        |   3 +-
 .../Analysis/Th/TestThaiWordFilterFactory.cs       |   3 +-
 .../Analysis/Tr/TestApostropheFilter.cs            |   3 +-
 .../Analysis/Tr/TestApostropheFilterFactory.cs     |   3 +-
 .../Analysis/Tr/TestTurkishAnalyzer.cs             |   3 +-
 .../Analysis/Tr/TestTurkishLowerCaseFilter.cs      |   3 +-
 .../Tr/TestTurkishLowerCaseFilterFactory.cs        |   3 +-
 .../Util/BaseTokenStreamFactoryTestCase.cs         |   3 +-
 .../Analysis/Util/StringMockResourceLoader.cs      |   3 +-
 .../Analysis/Util/TestAnalysisSPILoader.cs         |   3 +-
 .../Analysis/Util/TestBufferedCharFilter.cs        |   5 +-
 .../Analysis/Util/TestCharArrayIterator.cs         |   3 +-
 .../Analysis/Util/TestCharArrayMap.cs              |   3 +-
 .../Analysis/Util/TestCharArraySet.cs              |   3 +-
 .../Analysis/Util/TestCharTokenizers.cs            |   3 +-
 .../Analysis/Util/TestCharacterUtils.cs            |   3 +-
 .../Analysis/Util/TestElision.cs                   |   3 +-
 .../Analysis/Util/TestElisionFilterFactory.cs      |   3 +-
 .../Analysis/Util/TestFilesystemResourceLoader.cs  |   3 +-
 .../Analysis/Util/TestRollingCharBuffer.cs         |   3 +-
 .../Analysis/Util/TestSegmentingTokenizerBase.cs   |   1 +
 .../Analysis/Util/TestWordlistLoader.cs            |   3 +-
 .../Wikipedia/TestWikipediaTokenizerFactory.cs     |   3 +-
 .../Analysis/Wikipedia/WikipediaTokenizerTest.cs   |   3 +-
 .../Collation/TestCollationKeyAnalyzer.cs          |   3 +-
 .../Collation/TestCollationKeyFilter.cs            |   3 +-
 .../Collation/TestCollationKeyFilterFactory.cs     |   3 +-
 .../Lucene.Net.Tests.Analysis.Common.csproj        |  13 +-
 src/Lucene.Net.Tests.Analysis.Common/Startup.cs    |  15 +-
 .../Support/TestApiConsistency.cs                  |   3 +-
 .../Support/TestExceptionSerialization.cs          |   3 +-
 748 files changed, 2673 insertions(+), 995 deletions(-)
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Foo.cs
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Test64kAffixes.cs
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestHomonyms.cs => TestCondition2.cs} (79%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestMorph.cs => TestConditionGH418.cs} (75%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestHomonyms.cs => TestDoubleEscape.cs} (79%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestHomonyms.cs => TestFullStrip.cs} (80%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestTwoSuffixes.cs => TestKeepCase.cs} (62%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestCircumfix.cs => TestMorphAlias.cs} (62%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestCircumfix.cs => TestMorphData.cs} (62%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestTwoSuffixes.cs => TestNeedAffix.cs} (68%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestTwoSuffixes.cs => TestOnlyInCompound.cs} (74%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestDependencies.cs => TestSpaces.cs} (57%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestMorph.cs => TestStrangeOvergeneration.cs} (72%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestHomonyms.cs => TestZeroAffix.cs} (79%)
 copy src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/{TestHomonyms.cs => TestZeroAffix2.cs} (80%)
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.dic
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.aff
 create mode 100644 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.dic


[lucenenet] 06/08: Lucene.Net.Tests.Analysis.Common: Simplified configuration to remove .dic and .aff files from the build

Posted by ni...@apache.org.
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 55c8bc433ba83d525794768eb66ef6bfc1c2aaf0
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Thu Feb 25 05:41:12 2021 +0700

    Lucene.Net.Tests.Analysis.Common: Simplified configuration to remove .dic and .aff files from the build
---
 .../Lucene.Net.Tests.Analysis.Common.csproj        | 29 +---------------------
 1 file changed, 1 insertion(+), 28 deletions(-)

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index dac5f852..0e8f2eb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -37,34 +37,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="Analysis\Hunspell\alternate-casing.aff" />
-    <None Remove="Analysis\Hunspell\alternate-casing.dic" />
-    <None Remove="Analysis\Hunspell\casesensitive.aff" />
-    <None Remove="Analysis\Hunspell\casesensitive.dic" />
-    <None Remove="Analysis\Hunspell\condition2.aff" />
-    <None Remove="Analysis\Hunspell\condition2.dic" />
-    <None Remove="Analysis\Hunspell\double-escaped.aff" />
-    <None Remove="Analysis\Hunspell\double-escaped.dic" />
-    <None Remove="Analysis\Hunspell\fullstrip.aff" />
-    <None Remove="Analysis\Hunspell\fullstrip.dic" />
-    <None Remove="Analysis\Hunspell\keepcase.aff" />
-    <None Remove="Analysis\Hunspell\keepcase.dic" />
-    <None Remove="Analysis\Hunspell\morphalias.aff" />
-    <None Remove="Analysis\Hunspell\morphalias.dic" />
-    <None Remove="Analysis\Hunspell\morphdata.aff" />
-    <None Remove="Analysis\Hunspell\morphdata.dic" />
-    <None Remove="Analysis\Hunspell\needaffix.aff" />
-    <None Remove="Analysis\Hunspell\needaffix.dic" />
-    <None Remove="Analysis\Hunspell\onlyincompound.aff" />
-    <None Remove="Analysis\Hunspell\onlyincompound.dic" />
-    <None Remove="Analysis\Hunspell\spaces.aff" />
-    <None Remove="Analysis\Hunspell\spaces.dic" />
-    <None Remove="Analysis\Hunspell\strange-overgeneration.aff" />
-    <None Remove="Analysis\Hunspell\strange-overgeneration.dic" />
-    <None Remove="Analysis\Hunspell\zeroaffix.aff" />
-    <None Remove="Analysis\Hunspell\zeroaffix.dic" />
-    <None Remove="Analysis\Hunspell\zeroaffix2.aff" />
-    <None Remove="Analysis\Hunspell\zeroaffix2.dic" />
+    <None Remove="**/*.dic;**/*.aff" />
   </ItemGroup>
 
   <ItemGroup>


[lucenenet] 04/08: Lucene.Net.Analysis.Common: Upgraded Lucene.Net.Analysis.Hunspell namespace to Lucene 4.10.4 because 4.8.1 was buggy (fixes #418, fixes #419)

Posted by ni...@apache.org.
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 e7eb28653e9a1b6853fcf3b14027d9198128d5b0
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Wed Feb 24 15:05:30 2021 +0700

    Lucene.Net.Analysis.Common: Upgraded Lucene.Net.Analysis.Hunspell namespace to Lucene 4.10.4 because 4.8.1 was buggy (fixes #418, fixes #419)
---
 .../Analysis/Hunspell/Dictionary.cs                | 463 ++++++++++++++++-----
 .../Analysis/Hunspell/HunspellStemFilter.cs        |   2 +-
 .../Analysis/Hunspell/HunspellStemFilterFactory.cs |   2 +-
 .../Analysis/Hunspell/ISO8859_14Decoder.cs         |   2 +-
 .../Analysis/Hunspell/Stemmer.cs                   | 315 ++++++++++++--
 .../Analysis/Hunspell/Foo.cs                       |  12 +
 .../Analysis/Hunspell/StemmerTestBase.cs           |   2 +-
 .../Analysis/Hunspell/Test64kAffixes.cs            |  69 +++
 .../Analysis/Hunspell/TestAllDictionaries.cs       |   4 +-
 .../Analysis/Hunspell/TestAllDictionaries2.cs      |  15 +-
 .../Analysis/Hunspell/TestAlternateCasing.cs       |  67 +++
 .../Analysis/Hunspell/TestCaseInsensitive.cs       |   2 +-
 .../Analysis/Hunspell/TestCaseSensitive.cs         |  71 ++++
 .../Analysis/Hunspell/TestCircumfix.cs             |   2 +-
 .../Analysis/Hunspell/TestComplexPrefix.cs         |   2 +-
 .../Analysis/Hunspell/TestCondition.cs             |   2 +-
 .../{TestHomonyms.cs => TestCondition2.cs}         |  15 +-
 .../Analysis/Hunspell/TestConv.cs                  |   2 +-
 .../Analysis/Hunspell/TestDependencies.cs          |   2 +-
 .../Analysis/Hunspell/TestDictionary.cs            |   3 +-
 .../{TestHomonyms.cs => TestDoubleEscape.cs}       |  15 +-
 .../Analysis/Hunspell/TestEscaped.cs               |   2 +-
 .../Analysis/Hunspell/TestFlagLong.cs              |   3 +-
 .../Analysis/Hunspell/TestFlagNum.cs               |   2 +-
 .../Hunspell/{TestHomonyms.cs => TestFullStrip.cs} |  15 +-
 .../Analysis/Hunspell/TestHomonyms.cs              |   2 +-
 .../Analysis/Hunspell/TestHunspellStemFilter.cs    |   2 +-
 .../Hunspell/TestHunspellStemFilterFactory.cs      |   2 +-
 .../Analysis/Hunspell/TestIgnore.cs                |   2 +-
 .../{TestTwoSuffixes.cs => TestKeepCase.cs}        |  28 +-
 .../Analysis/Hunspell/TestMorph.cs                 |   2 +-
 .../{TestHomonyms.cs => TestMorphAlias.cs}         |  22 +-
 .../Hunspell/{TestHomonyms.cs => TestMorphData.cs} |  22 +-
 .../{TestTwoSuffixes.cs => TestNeedAffix.cs}       |  24 +-
 .../{TestTwoSuffixes.cs => TestOnlyInCompound.cs}  |  20 +-
 .../Analysis/Hunspell/TestOptionalCondition.cs     |   2 +-
 .../Hunspell/{TestCondition.cs => TestSpaces.cs}   |  35 +-
 .../Analysis/Hunspell/TestStemmer.cs               |   2 +-
 ...estHomonyms.cs => TestStrangeOvergeneration.cs} |  18 +-
 .../Analysis/Hunspell/TestTwoFold.cs               |   2 +-
 .../Analysis/Hunspell/TestTwoSuffixes.cs           |   2 +-
 .../Hunspell/{TestHomonyms.cs => TestZeroAffix.cs} |  15 +-
 .../{TestHomonyms.cs => TestZeroAffix2.cs}         |  15 +-
 .../Analysis/Hunspell/alternate-casing.aff         |  15 +
 .../Analysis/Hunspell/alternate-casing.dic         |   4 +
 .../Analysis/Hunspell/casesensitive.aff            |  16 +
 .../Analysis/Hunspell/casesensitive.dic            |   4 +
 .../Analysis/Hunspell/circumfix.dic                |   2 +-
 .../Analysis/Hunspell/condition2.aff               |   5 +
 .../Analysis/Hunspell/condition2.dic               |   2 +
 .../Analysis/Hunspell/conv.dic                     |   2 +-
 .../Analysis/Hunspell/dependencies.dic             |   4 +-
 .../Analysis/Hunspell/double-escaped.aff           |   5 +
 .../Analysis/Hunspell/double-escaped.dic           |   2 +
 .../Analysis/Hunspell/flaglong.aff                 |   3 +
 .../Analysis/Hunspell/fullstrip.aff                |   6 +
 .../Analysis/Hunspell/fullstrip.dic                |   2 +
 .../Analysis/Hunspell/homonyms.dic                 |   4 +-
 .../Analysis/Hunspell/ignore.dic                   |   4 +-
 .../Analysis/Hunspell/keepcase.aff                 |   6 +
 .../Analysis/Hunspell/keepcase.dic                 |   4 +
 .../Analysis/Hunspell/morph.dic                    |   2 +-
 .../Analysis/Hunspell/morphalias.aff               |  16 +
 .../Analysis/Hunspell/morphalias.dic               |   6 +
 .../Analysis/Hunspell/morphdata.aff                |  10 +
 .../Analysis/Hunspell/morphdata.dic                |   6 +
 .../Analysis/Hunspell/needaffix.aff                |   9 +
 .../Analysis/Hunspell/needaffix.dic                |   4 +
 .../Analysis/Hunspell/onlyincompound.aff           |  12 +
 .../Analysis/Hunspell/onlyincompound.dic           |   4 +
 .../Analysis/Hunspell/spaces.aff                   |   5 +
 .../Analysis/Hunspell/spaces.dic                   |   9 +
 .../Analysis/Hunspell/strange-overgeneration.aff   |  10 +
 .../Analysis/Hunspell/strange-overgeneration.dic   |   5 +
 .../Analysis/Hunspell/twosuffixes.dic              |   2 +-
 .../Analysis/Hunspell/zeroaffix.aff                |   4 +
 .../Analysis/Hunspell/zeroaffix.dic                |   2 +
 .../Analysis/Hunspell/zeroaffix2.aff               |   6 +
 .../Analysis/Hunspell/zeroaffix2.dic               |   2 +
 .../Lucene.Net.Tests.Analysis.Common.csproj        |  39 +-
 src/Lucene.Net.Tests.Analysis.Common/Startup.cs    |   8 +-
 81 files changed, 1278 insertions(+), 281 deletions(-)

diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
index 38d19f5..b175b58 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using J2N;
 using J2N.Collections.Generic.Extensions;
 using J2N.Numerics;
@@ -43,9 +43,10 @@ namespace Lucene.Net.Analysis.Hunspell
     /// </summary>
     public class Dictionary
     {
-        private static readonly char[] NOFLAGS = new char[0];
+        private static readonly char[] NOFLAGS = Arrays.Empty<char>();
 
         private const string ALIAS_KEY = "AF";
+        private const string MORPH_ALIAS_KEY = "AM";
         private const string PREFIX_KEY = "PFX";
         private const string SUFFIX_KEY = "SFX";
         private const string FLAG_KEY = "FLAG";
@@ -54,6 +55,12 @@ namespace Lucene.Net.Analysis.Hunspell
         private const string IGNORE_KEY = "IGNORE";
         private const string ICONV_KEY = "ICONV";
         private const string OCONV_KEY = "OCONV";
+        private const string FULLSTRIP_KEY = "FULLSTRIP";
+        private const string LANG_KEY = "LANG";
+        private const string KEEPCASE_KEY = "KEEPCASE";
+        private const string NEEDAFFIX_KEY = "NEEDAFFIX";
+        private const string PSEUDOROOT_KEY = "PSEUDOROOT";
+        private const string ONLYINCOMPOUND_KEY = "ONLYINCOMPOUND";
 
         private const string NUM_FLAG_TYPE = "num";
         private const string UTF8_FLAG_TYPE = "UTF-8";
@@ -87,9 +94,21 @@ namespace Lucene.Net.Analysis.Hunspell
 
         private FlagParsingStrategy flagParsingStrategy = new SimpleFlagParsingStrategy(); // Default flag parsing strategy
 
+        // AF entries
         private string[] aliases;
         private int aliasCount = 0;
 
+        // AM entries
+        private string[] morphAliases;
+        private int morphAliasCount = 0;
+
+        // st: morphological entries (either directly, or aliased from AM)
+        private string[] stemExceptions = new string[8];
+        private int stemExceptionCount = 0;
+        // we set this during sorting, so we know to add an extra FST output.
+        // when set, some words have exceptional stems, and the last entry is a pointer to stemExceptions
+        internal bool hasStemExceptions;
+
         private readonly DirectoryInfo tempDir = OfflineSorter.DefaultTempDir(); // TODO: make this configurable?
 
         internal bool ignoreCase;
@@ -97,6 +116,9 @@ namespace Lucene.Net.Analysis.Hunspell
         internal bool twoStageAffix; // if no affixes have continuation classes, no need to do 2-level affix stripping
 
         internal int circumfix = -1; // circumfix flag, or -1 if one is not defined
+        internal int keepcase = -1;  // keepcase flag, or -1 if one is not defined
+        internal int needaffix = -1; // needaffix flag, or -1 if one is not defined
+        internal int onlyincompound = -1; // onlyincompound flag, or -1 if one is not defined
 
         // ignored characters (dictionary, affix, inputs)
         private char[] ignore;
@@ -108,6 +130,14 @@ namespace Lucene.Net.Analysis.Hunspell
         internal bool needsInputCleaning;
         internal bool needsOutputCleaning;
 
+        // true if we can strip suffixes "down to nothing"
+        internal bool fullStrip;
+
+        // language declaration of the dictionary
+        internal string language;
+        // true if case algorithms should use alternate (Turkish/Azeri) mapping
+        internal bool alternateCasing;
+
         // LUCENENET: Added so we can get better performance than creating the regex in every tight loop.
         private static readonly Regex whitespacePattern = new Regex("\\s+", RegexOptions.Compiled);
         private static readonly Regex leadingDigitPattern = new Regex("[^0-9]", RegexOptions.Compiled);
@@ -144,58 +174,56 @@ namespace Lucene.Net.Analysis.Hunspell
             flagLookup.Add(new BytesRef()); // no flags -> ord 0
 
             FileInfo aff = FileSupport.CreateTempFile("affix", "aff", tempDir);
-            using (Stream @out = aff.Open(FileMode.Open, FileAccess.ReadWrite))
-            {
-                // copy contents of affix stream to temp file
-                affix.CopyTo(@out);
-            }
-
-            // pass 1: get encoding
-            string encoding;
-            using (Stream aff1 = aff.Open(FileMode.Open, FileAccess.Read))
+            try
             {
-                encoding = GetDictionaryEncoding(aff1);
-            }
+                using (Stream @out = aff.Open(FileMode.Open, FileAccess.ReadWrite))
+                {
+                    // copy contents of affix stream to temp file
+                    affix.CopyTo(@out);
+                }
 
-            // pass 2: parse affixes
-            Encoding decoder = GetSystemEncoding(encoding);
-            using (Stream aff2 = aff.Open(FileMode.Open, FileAccess.Read))
-            {
-                ReadAffixFile(aff2, decoder);
-            }
+                // pass 1: get encoding
+                string encoding;
+                using (Stream aff1 = aff.Open(FileMode.Open, FileAccess.Read))
+                {
+                    encoding = GetDictionaryEncoding(aff1);
+                }
 
-            // read dictionary entries
-            Int32SequenceOutputs o = Int32SequenceOutputs.Singleton;
-            Builder<Int32sRef> b = new Builder<Int32sRef>(FST.INPUT_TYPE.BYTE4, o);
-            ReadDictionaryFiles(dictionaries, decoder, b);
-            words = b.Finish();
-            aliases = null; // no longer needed
+                // pass 2: parse affixes
+                Encoding decoder = GetSystemEncoding(encoding);
+                using (Stream aff2 = aff.Open(FileMode.Open, FileAccess.Read))
+                {
+                    ReadAffixFile(aff2, decoder);
+                }
 
-            try
-            {
-                aff.Delete();
+                // read dictionary entries
+                Int32SequenceOutputs o = Int32SequenceOutputs.Singleton;
+                Builder<Int32sRef> b = new Builder<Int32sRef>(FST.INPUT_TYPE.BYTE4, o);
+                ReadDictionaryFiles(dictionaries, decoder, b);
+                words = b.Finish();
+                aliases = null; // no longer needed
+                morphAliases = null; // no longer needed
             }
-            catch
+            finally
             {
-                // ignore
+                try
+                {
+                    aff.Delete();
+                }
+                catch
+                {
+                    // ignore
+                }
             }
         }
 
-        /// <summary>
-        /// Looks up Hunspell word forms from the dictionary
-        /// </summary>
+        // only for testing
         internal virtual Int32sRef LookupWord(char[] word, int offset, int length)
         {
             return Lookup(words, word, offset, length);
         }
 
-        /// <summary>
-        /// Looks up HunspellAffix prefixes that have an append that matches the <see cref="string"/> created from the given <see cref="char"/> array, offset and length
-        /// </summary>
-        /// <param name="word"> <see cref="char"/> array to generate the <see cref="string"/> from </param>
-        /// <param name="offset"> Offset in the <see cref="char"/> array that the <see cref="string"/> starts at </param>
-        /// <param name="length"> Length from the offset that the <see cref="string"/> is </param>
-        /// <returns> List of HunspellAffix prefixes with an append that matches the <see cref="string"/>, or <c>null</c> if none are found </returns>
+        // only for testing
         internal virtual Int32sRef LookupPrefix(char[] word, int offset, int length)
         {
             return Lookup(prefixes, word, offset, length);
@@ -213,8 +241,6 @@ namespace Lucene.Net.Analysis.Hunspell
             return Lookup(suffixes, word, offset, length);
         }
 
-        // TODO: this is pretty stupid, considering how the stemming algorithm works
-        // we can speed it up to be significantly faster!
         internal virtual Int32sRef Lookup(FST<Int32sRef> fst, char[] word, int offset, int length)
         {
             if (fst == null)
@@ -269,8 +295,8 @@ namespace Lucene.Net.Analysis.Hunspell
         /// <exception cref="IOException"> Can be thrown while reading from the InputStream </exception>
         private void ReadAffixFile(Stream affixStream, Encoding decoder)
         {
-            JCG.SortedDictionary<string, IList<char?>> prefixes = new JCG.SortedDictionary<string, IList<char?>>(StringComparer.Ordinal);
-            JCG.SortedDictionary<string, IList<char?>> suffixes = new JCG.SortedDictionary<string, IList<char?>>(StringComparer.Ordinal);
+            var prefixes = new JCG.SortedDictionary<string, IList<int>>(StringComparer.Ordinal);
+            var suffixes = new JCG.SortedDictionary<string, IList<int>>(StringComparer.Ordinal);
             IDictionary<string, int?> seenPatterns = new JCG.Dictionary<string, int?>
             {
                 // zero condition -> 0 ord
@@ -285,7 +311,7 @@ namespace Lucene.Net.Analysis.Hunspell
             };
 
             var reader = new StreamReader(affixStream, decoder);
-            string line = null;
+            string line; // LUCENENET: Removed unnecessary null assignment
             int lineNumber = 0;
             while ((line = reader.ReadLine()) != null)
             {
@@ -299,6 +325,10 @@ namespace Lucene.Net.Analysis.Hunspell
                 {
                     ParseAlias(line);
                 }
+                else if (line.StartsWith(MORPH_ALIAS_KEY, StringComparison.Ordinal))
+                {
+                    ParseMorphAlias(line);
+                }
                 else if (line.StartsWith(PREFIX_KEY, StringComparison.Ordinal))
                 {
                     ParseAffix(prefixes, line, reader, PREFIX_CONDITION_REGEX_PATTERN, seenPatterns, seenStrips);
@@ -322,16 +352,43 @@ namespace Lucene.Net.Analysis.Hunspell
                     string[] parts = whitespacePattern.Split(line).TrimEnd();
                     if (parts.Length != 2)
                     {
-                        throw new Exception(string.Format("Illegal CIRCUMFIX declaration, line {0}", lineNumber));
+                        throw new FormatException(string.Format("Illegal CIRCUMFIX declaration, line {0}", lineNumber));
                     }
                     circumfix = flagParsingStrategy.ParseFlag(parts[1]);
                 }
+                else if (line.StartsWith(KEEPCASE_KEY, StringComparison.Ordinal))
+                {
+                    string[] parts = whitespacePattern.Split(line).TrimEnd();
+                    if (parts.Length != 2)
+                    {
+                        throw new FormatException(string.Format("Illegal KEEPCASE declaration, line {0}", lineNumber));
+                    }
+                    keepcase = flagParsingStrategy.ParseFlag(parts[1]);
+                }
+                else if (line.StartsWith(NEEDAFFIX_KEY, StringComparison.Ordinal) || line.StartsWith(PSEUDOROOT_KEY, StringComparison.Ordinal))
+                {
+                    string[] parts = whitespacePattern.Split(line).TrimEnd();
+                    if (parts.Length != 2)
+                    {
+                        throw new FormatException(string.Format("Illegal NEEDAFFIX declaration, line {0}", lineNumber));
+                    }
+                    needaffix = flagParsingStrategy.ParseFlag(parts[1]);
+                }
+                else if (line.StartsWith(ONLYINCOMPOUND_KEY, StringComparison.Ordinal))
+                {
+                    string[] parts = whitespacePattern.Split(line).TrimEnd();
+                    if (parts.Length != 2)
+                    {
+                        throw new FormatException(string.Format("Illegal ONLYINCOMPOUND declaration, line {0}", lineNumber));
+                    }
+                    onlyincompound = flagParsingStrategy.ParseFlag(parts[1]);
+                }
                 else if (line.StartsWith(IGNORE_KEY, StringComparison.Ordinal))
                 {
                     string[] parts = whitespacePattern.Split(line).TrimEnd();
                     if (parts.Length != 2)
                     {
-                        throw new Exception(string.Format("Illegal IGNORE declaration, line {0}", lineNumber));
+                        throw new FormatException(string.Format("Illegal IGNORE declaration, line {0}", lineNumber));
                     }
                     ignore = parts[1].ToCharArray();
                     Array.Sort(ignore);
@@ -343,7 +400,7 @@ namespace Lucene.Net.Analysis.Hunspell
                     string type = parts[0];
                     if (parts.Length != 2)
                     {
-                        throw new Exception(string.Format("Illegal {0} declaration, line {1}", type, lineNumber));
+                        throw new FormatException(string.Format("Illegal {0} declaration, line {1}", type, lineNumber));
                     }
                     int num = int.Parse(parts[1], CultureInfo.InvariantCulture);
                     FST<CharsRef> res = ParseConversions(reader, num);
@@ -358,6 +415,15 @@ namespace Lucene.Net.Analysis.Hunspell
                         needsOutputCleaning |= oconv != null;
                     }
                 }
+                else if (line.StartsWith(FULLSTRIP_KEY, StringComparison.Ordinal))
+                {
+                    fullStrip = true;
+                }
+                else if (line.StartsWith(LANG_KEY, StringComparison.Ordinal))
+                {
+                    language = line.Substring(LANG_KEY.Length).Trim();
+                    alternateCasing = "tr_TR".Equals(language, StringComparison.Ordinal) || "az_AZ".Equals(language, StringComparison.Ordinal);
+                }
             }
 
             this.prefixes = AffixFST(prefixes);
@@ -382,26 +448,51 @@ namespace Lucene.Net.Analysis.Hunspell
             stripOffsets[currentIndex] = currentOffset;
         }
 
-        private FST<Int32sRef> AffixFST(JCG.SortedDictionary<string, IList<char?>> affixes)
+        private FST<Int32sRef> AffixFST(JCG.SortedDictionary<string, IList<int>> affixes)
         {
             Int32SequenceOutputs outputs = Int32SequenceOutputs.Singleton;
             Builder<Int32sRef> builder = new Builder<Int32sRef>(FST.INPUT_TYPE.BYTE4, outputs);
 
             Int32sRef scratch = new Int32sRef();
-            foreach (KeyValuePair<string, IList<char?>> entry in affixes)
+            foreach (KeyValuePair<string, IList<int>> entry in affixes)
             {
                 Lucene.Net.Util.Fst.Util.ToUTF32(entry.Key, scratch);
-                IList<char?> entries = entry.Value;
+                IList<int> entries = entry.Value;
                 Int32sRef output = new Int32sRef(entries.Count);
-                foreach (char? c in entries)
+                foreach (int c in entries)
                 {
-                    output.Int32s[output.Length++] = c.HasValue ? c.Value : 0;
+                    output.Int32s[output.Length++] = c;
                 }
                 builder.Add(scratch, output);
             }
             return builder.Finish();
         }
 
+        internal static string EscapeDash(string re)
+        {
+            // we have to be careful, even though dash doesn't have a special meaning,
+            // some dictionaries already escape it (e.g. pt_PT), so we don't want to nullify it
+            StringBuilder escaped = new StringBuilder();
+            for (int i = 0; i < re.Length; i++)
+            {
+                char c = re[i];
+                if (c == '-')
+                {
+                    escaped.Append("\\-");
+                }
+                else
+                {
+                    escaped.Append(c);
+                    if (c == '\\' && i + 1 < re.Length)
+                    {
+                        escaped.Append(re[i + 1]);
+                        i++;
+                    }
+                }
+            }
+            return escaped.ToString();
+        }
+
         /// <summary>
         /// Parses a specific affix rule putting the result into the provided affix map
         /// </summary>
@@ -413,13 +504,19 @@ namespace Lucene.Net.Analysis.Hunspell
         /// <param name="seenPatterns"> map from condition -> index of patterns, for deduplication. </param>
         /// <param name="seenStrips"></param>
         /// <exception cref="IOException"> Can be thrown while reading the rule </exception>
-        private void ParseAffix(JCG.SortedDictionary<string, IList<char?>> affixes, string header, TextReader reader, string conditionPattern, IDictionary<string, int?> seenPatterns, IDictionary<string, int?> seenStrips)
+        private void ParseAffix(JCG.SortedDictionary<string, IList<int>> affixes,
+                    string header,
+                    TextReader reader,
+                    string conditionPattern,
+                    IDictionary<string, int?> seenPatterns,
+                    IDictionary<string, int?> seenStrips)
         {
             BytesRef scratch = new BytesRef();
             StringBuilder sb = new StringBuilder();
             string[] args = whitespacePattern.Split(header).TrimEnd();
 
             bool crossProduct = args[2].Equals("Y", StringComparison.Ordinal);
+            bool isSuffix = conditionPattern == SUFFIX_CONDITION_REGEX_PATTERN;
 
             int numLines = int.Parse(args[3], CultureInfo.InvariantCulture);
             affixData = ArrayUtil.Grow(affixData, (currentAffix << 3) + (numLines << 3));
@@ -435,7 +532,7 @@ namespace Lucene.Net.Analysis.Hunspell
                 // condition is optional
                 if (ruleArgs.Length < 4)
                 {
-                    throw new Exception("The affix file contains a rule with less than four elements: " + line /*, reader.LineNumber */);// LUCENENET TODO: LineNumberReader
+                    throw new FormatException("The affix file contains a rule with less than four elements: " + line /*, reader.LineNumber */);// LUCENENET TODO: LineNumberReader
                 }
 
                 char flag = flagParsingStrategy.ParseFlag(ruleArgs[1]);
@@ -443,6 +540,7 @@ namespace Lucene.Net.Analysis.Hunspell
                 string affixArg = ruleArgs[3];
                 char[] appendFlags = null;
 
+                // first: parse continuation classes out of affix
                 int flagSep = affixArg.LastIndexOf('/');
                 if (flagSep != -1)
                 {
@@ -458,19 +556,22 @@ namespace Lucene.Net.Analysis.Hunspell
                     Array.Sort(appendFlags);
                     twoStageAffix = true;
                 }
-
-                // TODO: add test and fix zero-affix handling!
+                // zero affix -> empty string
+                if ("0".Equals(affixArg, StringComparison.Ordinal))
+                {
+                    affixArg = "";
+                }
 
                 string condition = ruleArgs.Length > 4 ? ruleArgs[4] : ".";
                 // at least the gascon affix file has this issue
-                if (condition.StartsWith("[", StringComparison.Ordinal) && !condition.EndsWith("]", StringComparison.Ordinal))
+                if (condition.StartsWith("[", StringComparison.Ordinal) && condition.IndexOf(']') == -1)
                 {
                     condition = condition + "]";
                 }
                 // "dash hasn't got special meaning" (we must escape it)
                 if (condition.IndexOf('-') >= 0)
                 {
-                    condition = condition.Replace("-", "\\-");
+                    condition = EscapeDash(condition);
                 }
 
                 string regex;
@@ -543,12 +644,17 @@ namespace Lucene.Net.Analysis.Hunspell
                     affixArg = cleaned.ToString();
                 }
 
-                if (!affixes.TryGetValue(affixArg, out IList<char?> list) || list == null)
+                if (isSuffix)
                 {
-                    affixes[affixArg] = list = new List<char?>();
+                    affixArg = new StringBuilder(affixArg).Reverse().ToString();
                 }
 
-                list.Add((char)currentAffix);
+                if (!affixes.TryGetValue(affixArg, out IList<int> list) || list == null)
+                {
+                    affixes[affixArg] = list = new List<int>();
+                }
+
+                list.Add(currentAffix);
                 currentAffix++;
             }
         }
@@ -563,7 +669,7 @@ namespace Lucene.Net.Analysis.Hunspell
                 string[] parts = whitespacePattern.Split(line).TrimEnd();
                 if (parts.Length != 3)
                 {
-                    throw new Exception("invalid syntax: " + line /*, reader.LineNumber */); // LUCENENET TODO: LineNumberReader
+                    throw new FormatException("invalid syntax: " + line /*, reader.LineNumber */); // LUCENENET TODO: LineNumberReader
                 }
                 if (mappings.Put(parts[1], parts[2]) != null)
                 {
@@ -617,7 +723,7 @@ namespace Lucene.Net.Analysis.Hunspell
                     // this test only at the end as ineffective but would allow lines only containing spaces:
                     if (ch < 0)
                     {
-                        throw new Exception("Unexpected end of affix file." /*, 0*/);
+                        throw new FormatException("Unexpected end of affix file." /*, 0*/);
                     }
                     continue;
                 }
@@ -646,7 +752,7 @@ namespace Lucene.Net.Analysis.Hunspell
         /// </summary>
         /// <param name="encoding"> Encoding to retrieve the <see cref="Encoding"/> instance for </param>
         /// <returns> <see cref="Encoding"/> for the given encoding <see cref="string"/> </returns>
-        // LUCENENET NOTE: This was getJavaEncoding in the original
+        // LUCENENET NOTE: This was getJavaEncoding in Lucene
         private Encoding GetSystemEncoding(string encoding)
         {
             if (string.IsNullOrEmpty(encoding))
@@ -713,12 +819,14 @@ namespace Lucene.Net.Analysis.Hunspell
             throw new ArgumentException("Unknown flag type: " + flagType);
         }
 
-        internal readonly char FLAG_SEPARATOR = (char)0x1f; // flag separator after escaping
+        internal const char FLAG_SEPARATOR = (char)0x1f; // flag separator after escaping
+        internal const char MORPH_SEPARATOR = (char)0x1e; // separator for boundary of entry (may be followed by morph data)
 
         internal virtual string UnescapeEntry(string entry)
         {
             StringBuilder sb = new StringBuilder();
-            for (int i = 0; i < entry.Length; i++)
+            int end = MorphBoundary(entry);
+            for (int i = 0; i < end; i++)
             {
                 char ch = entry[i];
                 if (ch == '\\' && i + 1 < entry.Length)
@@ -730,14 +838,74 @@ namespace Lucene.Net.Analysis.Hunspell
                 {
                     sb.Append(FLAG_SEPARATOR);
                 }
+                else if (ch == MORPH_SEPARATOR || ch == FLAG_SEPARATOR)
+                {
+                    // BINARY EXECUTABLES EMBEDDED IN ZULU DICTIONARIES!!!!!!!
+                }
                 else
                 {
                     sb.Append(ch);
                 }
             }
+            sb.Append(MORPH_SEPARATOR);
+            if (end < entry.Length)
+            {
+                for (int i = end; i < entry.Length; i++)
+                {
+                    char c = entry[i];
+                    if (c == FLAG_SEPARATOR || c == MORPH_SEPARATOR)
+                    {
+                        // BINARY EXECUTABLES EMBEDDED IN ZULU DICTIONARIES!!!!!!!
+                    }
+                    else
+                    {
+                        sb.Append(c);
+                    }
+                }
+            }
             return sb.ToString();
         }
 
+        internal static int MorphBoundary(string line)
+        {
+            int end = IndexOfSpaceOrTab(line, 0);
+            if (end == -1)
+            {
+                return line.Length;
+            }
+            while (end >= 0 && end < line.Length)
+            {
+                if (line[end] == '\t' ||
+                    end + 3 < line.Length &&
+                    Character.IsLetter(line[end + 1]) &&
+                    Character.IsLetter(line[end + 2]) &&
+                    line[end + 3] == ':')
+                {
+                    break;
+                }
+                end = IndexOfSpaceOrTab(line, end + 1);
+            }
+            if (end == -1)
+            {
+                return line.Length;
+            }
+            return end;
+        }
+
+        internal static int IndexOfSpaceOrTab(string text, int start)
+        {
+            int pos1 = text.IndexOf('\t', start);
+            int pos2 = text.IndexOf(' ', start);
+            if (pos1 >= 0 && pos2 >= 0)
+            {
+                return Math.Min(pos1, pos2);
+            }
+            else
+            {
+                return Math.Max(pos1, pos2);
+            }
+        }
+
         /// <summary>
         /// Reads the dictionary file through the provided <see cref="Stream"/>s, building up the words map
         /// </summary>
@@ -762,12 +930,30 @@ namespace Lucene.Net.Analysis.Hunspell
 
                     while ((line = lines.ReadLine()) != null)
                     {
+                        // wild and unpredictable code comment rules
+                        if (line == string.Empty || line[0] == '/' || line[0] == '#' || line[0] == '\t')
+                        {
+                            continue;
+                        }
                         line = UnescapeEntry(line);
+                        // if we havent seen any stem exceptions, try to parse one
+                        if (hasStemExceptions == false)
+                        {
+                            int morphStart = line.IndexOf(MORPH_SEPARATOR);
+                            if (morphStart >= 0 && morphStart < line.Length)
+                            {
+                                hasStemExceptions = ParseStemException(line.Substring(morphStart + 1)) != null;
+                            }
+                        }
                         if (needsInputCleaning)
                         {
                             int flagSep = line.LastIndexOf(FLAG_SEPARATOR);
                             if (flagSep == -1)
                             {
+                                flagSep = line.IndexOf(MORPH_SEPARATOR);
+                            }
+                            if (flagSep == -1)
+                            {
                                 string cleansed = CleanInput(line, sb);
                                 writer.Write(cleansed.ToString().GetBytes(Encoding.UTF8));
                             }
@@ -805,7 +991,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
                 for (int i = scratch1.Length - 1; i >= 0; i--)
                 {
-                    if (scratch1.Bytes[scratch1.Offset + i] == this.FLAG_SEPARATOR)
+                    if (scratch1.Bytes[scratch1.Offset + i] == FLAG_SEPARATOR || scratch1.Bytes[scratch1.Offset + i] == MORPH_SEPARATOR)
                     {
                         scratch1.Length = i;
                         break;
@@ -818,7 +1004,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
                 for (int i = scratch2.Length - 1; i >= 0; i--)
                 {
-                    if (scratch2.Bytes[scratch2.Offset + i] == this.FLAG_SEPARATOR)
+                    if (scratch2.Bytes[scratch2.Offset + i] == FLAG_SEPARATOR || scratch2.Bytes[scratch2.Offset + i] == MORPH_SEPARATOR)
                     {
                         scratch2.Length = i;
                         break;
@@ -862,29 +1048,18 @@ namespace Lucene.Net.Analysis.Hunspell
                     line2 = scratchLine.Utf8ToString();
                     string entry;
                     char[] wordForm;
+                    int end;
 
-                    int flagSep = line2.LastIndexOf(FLAG_SEPARATOR);
+                    int flagSep = line2.IndexOf(FLAG_SEPARATOR);
                     if (flagSep == -1)
                     {
                         wordForm = NOFLAGS;
-                        entry = line2;
+                        end = line2.IndexOf(MORPH_SEPARATOR);
+                        entry = line2.Substring(0, end);
                     }
                     else
                     {
-                        // note, there can be comments (morph description) after a flag.
-                        // we should really look for any whitespace: currently just tab and space
-                        int end = line2.IndexOf('\t', flagSep);
-                        if (end == -1)
-                        {
-                            end = line2.Length;
-                        }
-                        int end2 = line2.IndexOf(' ', flagSep);
-                        if (end2 == -1)
-                        {
-                            end2 = line2.Length;
-                        }
-                        end = Math.Min(end, end2);
-
+                        end = line2.IndexOf(MORPH_SEPARATOR);
                         string flagPart = line2.Substring(flagSep + 1, end - (flagSep + 1));
                         if (aliasCount > 0)
                         {
@@ -895,6 +1070,23 @@ namespace Lucene.Net.Analysis.Hunspell
                         Array.Sort(wordForm);
                         entry = line2.Substring(0, flagSep - 0);
                     }
+                    // we possibly have morphological data
+                    int stemExceptionID = 0;
+                    if (hasStemExceptions && end + 1 < line2.Length)
+                    {
+                        string stemException = ParseStemException(line2.Substring(end + 1));
+                        if (stemException != null)
+                        {
+                            if (stemExceptionCount == stemExceptions.Length)
+                            {
+                                int newSize = ArrayUtil.Oversize(stemExceptionCount + 1, RamUsageEstimator.NUM_BYTES_OBJECT_REF);
+                                stemExceptions = Arrays.CopyOf(stemExceptions, newSize);
+                            }
+                            stemExceptionID = stemExceptionCount + 1; // we use '0' to indicate no exception for the form
+                            stemExceptions[stemExceptionCount++] = stemException;
+                        }
+                    }
+
                     // LUCENENET NOTE: CompareToOrdinal is an extension method that works similarly to
                     // Java's String.compareTo method.
                     int cmp = currentEntry == null ? 1 : entry.CompareToOrdinal(currentEntry);
@@ -923,8 +1115,17 @@ namespace Lucene.Net.Analysis.Hunspell
                             currentEntry = entry;
                             currentOrds = new Int32sRef(); // must be this way
                         }
-                        currentOrds.Grow(currentOrds.Length + 1);
-                        currentOrds.Int32s[currentOrds.Length++] = ord;
+                        if (hasStemExceptions)
+                        {
+                            currentOrds.Grow(currentOrds.Length + 2);
+                            currentOrds.Int32s[currentOrds.Length++] = ord;
+                            currentOrds.Int32s[currentOrds.Length++] = stemExceptionID;
+                        }
+                        else
+                        {
+                            currentOrds.Grow(currentOrds.Length + 1);
+                            currentOrds.Int32s[currentOrds.Length++] = ord;
+                        }
                     }
                 }
 
@@ -1002,6 +1203,54 @@ namespace Lucene.Net.Analysis.Hunspell
             }
         }
 
+        internal string GetStemException(int id)
+        {
+            return stemExceptions[id - 1];
+        }
+
+        private void ParseMorphAlias(string line)
+        {
+            if (morphAliases == null)
+            {
+                //first line should be the aliases count
+                int count = int.Parse(line.Substring(3), CultureInfo.InvariantCulture);
+                morphAliases = new string[count];
+            }
+            else
+            {
+                string arg = line.Substring(2); // leave the space
+                morphAliases[morphAliasCount++] = arg;
+            }
+        }
+
+        private string ParseStemException(string morphData)
+        {
+            // first see if its an alias
+            if (morphAliasCount > 0)
+            {
+                if (int.TryParse(morphData.Trim(), NumberStyles.Integer, CultureInfo.InvariantCulture, out int alias))
+                {
+                    morphData = morphAliases[alias - 1];
+                } // else fine
+            }
+            // try to parse morph entry
+            int index = morphData.IndexOf(" st:", StringComparison.Ordinal);
+            if (index < 0)
+            {
+                index = morphData.IndexOf("\tst:", StringComparison.Ordinal);
+            }
+            if (index >= 0)
+            {
+                int endIndex = IndexOfSpaceOrTab(morphData, index + 1);
+                if (endIndex < 0)
+                {
+                    endIndex = morphData.Length;
+                }
+                return morphData.Substring(index + 4, endIndex - (index + 4));
+            }
+            return null;
+        }
+
         /// <summary>
         /// Abstraction of the process of parsing flags taken from the affix and dic files
         /// </summary>
@@ -1077,8 +1326,6 @@ namespace Lucene.Net.Analysis.Hunspell
         /// <summary>
         /// Implementation of <see cref="FlagParsingStrategy"/> that assumes each flag is encoded as two ASCII characters whose codes
         /// must be combined into a single character.
-        /// 
-        /// TODO (rmuir) test
         /// </summary>
         private class DoubleASCIIFlagParsingStrategy : FlagParsingStrategy
         {
@@ -1096,8 +1343,14 @@ namespace Lucene.Net.Analysis.Hunspell
                 }
                 for (int i = 0; i < rawFlags.Length; i += 2)
                 {
-                    char cookedFlag = (char)((int)rawFlags[i] + (int)rawFlags[i + 1]);
-                    builder.Append(cookedFlag);
+                    char f1 = rawFlags[i];
+                    char f2 = rawFlags[i + 1];
+                    if (f1 >= 256 || f2 >= 256)
+                    {
+                        throw new ArgumentException("Invalid flags (LONG flags must be double ASCII): " + rawFlags);
+                    }
+                    char combined = (char)(f1 << 8 | f2);
+                    builder.Append(combined);
                 }
 
                 char[] flags = new char[builder.Length];
@@ -1127,7 +1380,7 @@ namespace Lucene.Net.Analysis.Hunspell
                 if (ignoreCase && iconv == null)
                 {
                     // if we have no input conversion mappings, do this on-the-fly
-                    ch = char.ToLowerInvariant(ch);
+                    ch = CaseFold(ch);
                 }
 
                 reuse.Append(ch);
@@ -1147,7 +1400,7 @@ namespace Lucene.Net.Analysis.Hunspell
                 {
                     for (int i = 0; i < reuse.Length; i++)
                     {
-                        reuse[i] = char.ToLowerInvariant(reuse[i]);
+                        reuse[i] = CaseFold(reuse[i]);
                     }
                 }
             }
@@ -1155,6 +1408,30 @@ namespace Lucene.Net.Analysis.Hunspell
             return reuse.ToString();
         }
 
+        // folds single character (according to LANG if present)
+        internal char CaseFold(char c)
+        {
+            if (alternateCasing)
+            {
+                if (c == 'I')
+                {
+                    return 'ı';
+                }
+                else if (c == 'İ')
+                {
+                    return 'i';
+                }
+                else
+                {
+                    return char.ToLowerInvariant(c);
+                }
+            }
+            else
+            {
+                return char.ToLowerInvariant(c);
+            }
+        }
+
         // TODO: this could be more efficient!
         internal static void ApplyMappings(FST<CharsRef> fst, StringBuilder sb)
         {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs
index d4526d6..d6c15e1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
index f5c044b..1752eab 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using J2N.Text;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs
index a406b68..6078954 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Support;
 using System;
 using System.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs
index ee0cb6b..41d31fc 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs
@@ -1,10 +1,11 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using J2N.Numerics;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Automaton;
+using Lucene.Net.Util.Fst;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -44,6 +45,10 @@ namespace Lucene.Net.Analysis.Hunspell
         private readonly StringBuilder scratchSegment = new StringBuilder();
         private char[] scratchBuffer = new char[32];
 
+        // its '1' if we have no stem exceptions, otherwise every other form
+        // is really an ID pointing to the exception table
+        private readonly int formStep;
+
         /// <summary>
         /// Constructs a new Stemmer which will use the provided <see cref="Dictionary"/> to create its stems.
         /// </summary>
@@ -52,6 +57,20 @@ namespace Lucene.Net.Analysis.Hunspell
         {
             this.dictionary = dictionary;
             this.affixReader = new ByteArrayDataInput(dictionary.affixData);
+            for (int level = 0; level < 3; level++)
+            {
+                if (dictionary.prefixes != null)
+                {
+                    prefixArcs[level] = new FST.Arc<Int32sRef>();
+                    prefixReaders[level] = dictionary.prefixes.GetBytesReader();
+                }
+                if (dictionary.suffixes != null)
+                {
+                    suffixArcs[level] = new FST.Arc<Int32sRef>();
+                    suffixReaders[level] = dictionary.suffixes.GetBytesReader();
+                }
+            }
+            formStep = dictionary.hasStemExceptions ? 2 : 1;
         }
 
         /// <summary>
@@ -84,18 +103,133 @@ namespace Lucene.Net.Analysis.Hunspell
                 word = scratchBuffer;
             }
 
+            int caseType = CaseOf(word, length);
+            if (caseType == UPPER_CASE)
+            {
+                // upper: union exact, title, lower
+                CaseFoldTitle(word, length);
+                CaseFoldLower(titleBuffer, length);
+                IList<CharsRef> list = DoStem(word, length, false);
+                list.AddRange(DoStem(titleBuffer, length, true));
+                list.AddRange(DoStem(lowerBuffer, length, true));
+                return list;
+            }
+            else if (caseType == TITLE_CASE)
+            {
+                // title: union exact, lower
+                CaseFoldLower(word, length);
+                IList<CharsRef> list = DoStem(word, length, false);
+                list.AddRange(DoStem(lowerBuffer, length, true));
+                return list;
+            }
+            else
+            {
+                // exact match only
+                return DoStem(word, length, false);
+            }
+        }
+
+        // temporary buffers for case variants
+        private char[] lowerBuffer = new char[8];
+        private char[] titleBuffer = new char[8];
+
+        private const int EXACT_CASE = 0;
+        private const int TITLE_CASE = 1;
+        private const int UPPER_CASE = 2;
+
+        // returns EXACT_CASE,TITLE_CASE, or UPPER_CASE type for the word
+        private int CaseOf(char[] word, int length)
+        {
+            if (dictionary.ignoreCase || length == 0 || !char.IsUpper(word[0]))
+            {
+                return EXACT_CASE;
+            }
+
+            // determine if we are title or lowercase (or something funky, in which its exact)
+            bool seenUpper = false;
+            bool seenLower = false;
+            for (int i = 1; i < length; i++)
+            {
+                bool v = char.IsUpper(word[i]);
+                seenUpper |= v;
+                seenLower |= !v;
+            }
+
+            if (!seenLower)
+            {
+                return UPPER_CASE;
+            }
+            else if (!seenUpper)
+            {
+                return TITLE_CASE;
+            }
+            else
+            {
+                return EXACT_CASE;
+            }
+        }
+
+        // folds titlecase variant of word to titleBuffer
+        private void CaseFoldTitle(char[] word, int length)
+        {
+            titleBuffer = ArrayUtil.Grow(titleBuffer, length);
+            System.Array.Copy(word, 0, titleBuffer, 0, length);
+            for (int i = 1; i < length; i++)
+            {
+                titleBuffer[i] = dictionary.CaseFold(titleBuffer[i]);
+            }
+        }
+
+        // folds lowercase variant of word (title cased) to lowerBuffer
+        private void CaseFoldLower(char[] word, int length)
+        {
+            lowerBuffer = ArrayUtil.Grow(lowerBuffer, length);
+            System.Array.Copy(word, 0, lowerBuffer, 0, length);
+            lowerBuffer[0] = dictionary.CaseFold(lowerBuffer[0]);
+        }
+
+        private IList<CharsRef> DoStem(char[] word, int length, bool caseVariant)
+        {
             List<CharsRef> stems = new List<CharsRef>();
             Int32sRef forms = dictionary.LookupWord(word, 0, length);
             if (forms != null)
             {
-                // TODO: some forms should not be added, e.g. ONLYINCOMPOUND
-                // just because it exists, does not make it valid...
-                for (int i = 0; i < forms.Length; i++)
+                for (int i = 0; i < forms.Length; i += formStep)
                 {
-                    stems.Add(NewStem(word, length));
+                    bool checkKeepCase = caseVariant && dictionary.keepcase != -1;
+                    bool checkNeedAffix = dictionary.needaffix != -1;
+                    bool checkOnlyInCompound = dictionary.onlyincompound != -1;
+                    if (checkKeepCase || checkNeedAffix || checkOnlyInCompound)
+                    {
+                        dictionary.flagLookup.Get(forms.Int32s[forms.Offset + i], scratch);
+                        char[] wordFlags = Dictionary.DecodeFlags(scratch);
+                        // we are looking for a case variant, but this word does not allow it
+                        if (checkKeepCase && Dictionary.HasFlag(wordFlags, (char)dictionary.keepcase))
+                        {
+                            continue;
+                        }
+                        // we can't add this form, its a pseudostem requiring an affix
+                        if (checkNeedAffix && Dictionary.HasFlag(wordFlags, (char)dictionary.needaffix))
+                        {
+                            continue;
+                        }
+                        // we can't add this form, it only belongs inside a compound word
+                        if (checkOnlyInCompound && Dictionary.HasFlag(wordFlags, (char)dictionary.onlyincompound))
+                        {
+                            continue;
+                        }
+                    }
+                    stems.Add(NewStem(word, length, forms, i));
                 }
             }
-            stems.AddRange(Stem(word, length, -1, -1, -1, 0, true, true, false, false));
+            try
+            {
+                stems.AddRange(Stem(word, length, -1, -1, -1, 0, true, true, false, false, caseVariant));
+            }
+            catch (IOException bogus)
+            {
+                throw new Exception(bogus.ToString(), bogus);
+            }
             return stems;
         }
 
@@ -128,12 +262,37 @@ namespace Lucene.Net.Analysis.Hunspell
             return deduped;
         }
 
-        private CharsRef NewStem(char[] buffer, int length)
+        private CharsRef NewStem(char[] buffer, int length, Int32sRef forms, int formID)
         {
+            string exception;
+            if (dictionary.hasStemExceptions)
+            {
+                int exceptionID = forms.Int32s[forms.Offset + formID + 1];
+                if (exceptionID > 0)
+                {
+                    exception = dictionary.GetStemException(exceptionID);
+                }
+                else
+                {
+                    exception = null;
+                }
+            }
+            else
+            {
+                exception = null;
+            }
+
             if (dictionary.needsOutputCleaning)
             {
                 scratchSegment.Length = 0;
-                scratchSegment.Append(buffer, 0, length);
+                if (exception != null)
+                {
+                    scratchSegment.Append(exception);
+                }
+                else
+                {
+                    scratchSegment.Append(buffer, 0, length);
+                }
                 try
                 {
                     Dictionary.ApplyMappings(dictionary.oconv, scratchSegment);
@@ -148,12 +307,26 @@ namespace Lucene.Net.Analysis.Hunspell
             }
             else
             {
-                return new CharsRef(buffer, 0, length);
+                if (exception != null)
+                {
+                    return new CharsRef(exception);
+                }
+                else
+                {
+                    return new CharsRef(buffer, 0, length);
+                }
             }
         }
 
         // ================================================= Helper Methods ================================================
 
+        // some state for traversing FSTs
+        private readonly FST.BytesReader[] prefixReaders = new FST.BytesReader[3];
+        private readonly FST.Arc<Int32sRef>[] prefixArcs = new FST.Arc<Int32sRef>[3];
+
+        private readonly FST.BytesReader[] suffixReaders = new FST.BytesReader[3];
+        private readonly FST.Arc<Int32sRef>[] suffixArcs = new FST.Arc<Int32sRef>[3];
+
         /// <summary>
         /// Generates a list of stems for the provided word
         /// </summary>
@@ -170,22 +343,46 @@ namespace Lucene.Net.Analysis.Hunspell
         ///        but two prefixes (COMPLEXPREFIXES) or two suffixes must have continuation requirements to recurse. </param>
         /// <param name="circumfix"> true if the previous prefix removal was signed as a circumfix
         ///        this means inner most suffix must also contain circumfix flag. </param>
+        /// <param name="caseVariant"> true if we are searching for a case variant. if the word has KEEPCASE flag it cannot succeed. </param>
         /// <returns> <see cref="IList{CharsRef}"/> of stems, or empty list if no stems are found </returns>
-        private IList<CharsRef> Stem(char[] word, int length, int previous, int prevFlag, int prefixFlag, int recursionDepth, bool doPrefix, bool doSuffix, bool previousWasPrefix, bool circumfix)
+        private IList<CharsRef> Stem(char[] word, int length, int previous, int prevFlag, int prefixFlag, int recursionDepth, bool doPrefix, bool doSuffix, bool previousWasPrefix, bool circumfix, bool caseVariant)
         {
-
             // TODO: allow this stuff to be reused by tokenfilter
             List<CharsRef> stems = new List<CharsRef>();
 
             if (doPrefix && dictionary.prefixes != null)
             {
-                for (int i = length - 1; i >= 0; i--)
+                FST<Int32sRef> fst = dictionary.prefixes;
+                Outputs<Int32sRef> outputs = fst.Outputs;
+                FST.BytesReader bytesReader = prefixReaders[recursionDepth];
+                FST.Arc<Int32sRef> arc = prefixArcs[recursionDepth];
+                fst.GetFirstArc(arc);
+                Int32sRef NO_OUTPUT = outputs.NoOutput;
+                Int32sRef output = NO_OUTPUT;
+                int limit = dictionary.fullStrip ? length : length - 1;
+                for (int i = 0; i < limit; i++)
                 {
-                    Int32sRef prefixes = dictionary.LookupPrefix(word, 0, i);
-                    if (prefixes == null)
+                    if (i > 0)
+                    {
+                        int ch = word[i - 1];
+                        if (fst.FindTargetArc(ch, arc, arc, bytesReader) == null)
+                        {
+                            break;
+                        }
+                        else if (arc.Output != NO_OUTPUT)
+                        {
+                            output = fst.Outputs.Add(output, arc.Output);
+                        }
+                    }
+                    Int32sRef prefixes; // LUCENENET: IDE0059 - Removed unnecessary value assignment
+                    if (!arc.IsFinal)
                     {
                         continue;
                     }
+                    else
+                    {
+                        prefixes = fst.Outputs.Add(output, arc.NextFinalOutput);
+                    }
 
                     for (int j = 0; j < prefixes.Length; j++)
                     {
@@ -205,7 +402,17 @@ namespace Lucene.Net.Analysis.Hunspell
                         bool compatible;
                         if (recursionDepth == 0)
                         {
-                            compatible = true;
+                            if (dictionary.onlyincompound == -1)
+                            {
+                                compatible = true;
+                            }
+                            else
+                            {
+                                // check if affix is allowed in a non-compound word
+                                dictionary.flagLookup.Get(append, scratch);
+                                char[] appendFlags = Dictionary.DecodeFlags(scratch);
+                                compatible = !Dictionary.HasFlag(appendFlags, (char)dictionary.onlyincompound);
+                            }
                         }
                         else if (crossProduct)
                         {
@@ -213,7 +420,9 @@ namespace Lucene.Net.Analysis.Hunspell
                             dictionary.flagLookup.Get(append, scratch);
                             char[] appendFlags = Dictionary.DecodeFlags(scratch);
                             if (Debugging.AssertsEnabled) Debugging.Assert(prevFlag >= 0);
-                            compatible = HasCrossCheckedFlag((char)prevFlag, appendFlags, false);
+                            bool allowed = dictionary.onlyincompound == -1 ||
+                                !Dictionary.HasFlag(appendFlags, (char)dictionary.onlyincompound);
+                            compatible = allowed && HasCrossCheckedFlag((char)prevFlag, appendFlags, false);
                         }
                         else
                         {
@@ -238,7 +447,7 @@ namespace Lucene.Net.Analysis.Hunspell
                             Array.Copy(dictionary.stripData, stripStart, strippedWord, 0, stripLength);
                             Array.Copy(word, deAffixedStart, strippedWord, stripLength, deAffixedLength);
 
-                            IList<CharsRef> stemList = ApplyAffix(strippedWord, strippedWord.Length, prefix, -1, recursionDepth, true, circumfix);
+                            IList<CharsRef> stemList = ApplyAffix(strippedWord, strippedWord.Length, prefix, -1, recursionDepth, true, circumfix, caseVariant);
 
                             stems.AddRange(stemList);
                         }
@@ -248,13 +457,37 @@ namespace Lucene.Net.Analysis.Hunspell
 
             if (doSuffix && dictionary.suffixes != null)
             {
-                for (int i = 0; i < length; i++)
+                FST<Int32sRef> fst = dictionary.suffixes;
+                Outputs<Int32sRef> outputs = fst.Outputs;
+                FST.BytesReader bytesReader = suffixReaders[recursionDepth];
+                FST.Arc<Int32sRef> arc = suffixArcs[recursionDepth];
+                fst.GetFirstArc(arc);
+                Int32sRef NO_OUTPUT = outputs.NoOutput;
+                Int32sRef output = NO_OUTPUT;
+                int limit = dictionary.fullStrip ? 0 : 1;
+                for (int i = length; i >= limit; i--)
                 {
-                    Int32sRef suffixes = dictionary.LookupSuffix(word, i, length - i);
-                    if (suffixes == null)
+                    if (i < length)
+                    {
+                        int ch = word[i];
+                        if (fst.FindTargetArc(ch, arc, arc, bytesReader) == null)
+                        {
+                            break;
+                        }
+                        else if (arc.Output != NO_OUTPUT)
+                        {
+                            output = fst.Outputs.Add(output, arc.Output);
+                        }
+                    }
+                    Int32sRef suffixes; // LUCENENET: IDE0059 - Removed unnecessary value assignment
+                    if (!arc.IsFinal)
                     {
                         continue;
                     }
+                    else
+                    {
+                        suffixes = fst.Outputs.Add(output, arc.NextFinalOutput);
+                    }
 
                     for (int j = 0; j < suffixes.Length; j++)
                     {
@@ -274,7 +507,17 @@ namespace Lucene.Net.Analysis.Hunspell
                         bool compatible;
                         if (recursionDepth == 0)
                         {
-                            compatible = true;
+                            if (dictionary.onlyincompound == -1)
+                            {
+                                compatible = true;
+                            }
+                            else
+                            {
+                                // check if affix is allowed in a non-compound word
+                                dictionary.flagLookup.Get(append, scratch);
+                                char[] appendFlags = Dictionary.DecodeFlags(scratch);
+                                compatible = !Dictionary.HasFlag(appendFlags, (char)dictionary.onlyincompound);
+                            }
                         }
                         else if (crossProduct)
                         {
@@ -282,6 +525,8 @@ namespace Lucene.Net.Analysis.Hunspell
                             dictionary.flagLookup.Get(append, scratch);
                             char[] appendFlags = Dictionary.DecodeFlags(scratch);
                             if (Debugging.AssertsEnabled) Debugging.Assert(prevFlag >= 0);
+                            bool allowed = dictionary.onlyincompound == -1 ||
+                                !Dictionary.HasFlag(appendFlags, (char)dictionary.onlyincompound);
                             compatible = HasCrossCheckedFlag((char)prevFlag, appendFlags, previousWasPrefix);
                         }
                         else
@@ -307,7 +552,7 @@ namespace Lucene.Net.Analysis.Hunspell
                             Array.Copy(word, 0, strippedWord, 0, deAffixedLength);
                             Array.Copy(dictionary.stripData, stripStart, strippedWord, deAffixedLength, stripLength);
 
-                            IList<CharsRef> stemList = ApplyAffix(strippedWord, strippedWord.Length, suffix, prefixFlag, recursionDepth, false, circumfix);
+                            IList<CharsRef> stemList = ApplyAffix(strippedWord, strippedWord.Length, suffix, prefixFlag, recursionDepth, false, circumfix, caseVariant);
 
                             stems.AddRange(stemList);
                         }
@@ -361,8 +606,9 @@ namespace Lucene.Net.Analysis.Hunspell
         /// <param name="prefix"> true if we are removing a prefix (false if its a suffix) </param>
         /// <param name="circumfix"> true if the previous prefix removal was signed as a circumfix
         ///        this means inner most suffix must also contain circumfix flag. </param>
+        /// <param name="caseVariant"> true if we are searching for a case variant. if the word has KEEPCASE flag it cannot succeed. </param>
         /// <returns> <see cref="IList{CharsRef}"/> of stems for the word, or an empty list if none are found </returns>
-        internal IList<CharsRef> ApplyAffix(char[] strippedWord, int length, int affix, int prefixFlag, int recursionDepth, bool prefix, bool circumfix)
+        internal IList<CharsRef> ApplyAffix(char[] strippedWord, int length, int affix, int prefixFlag, int recursionDepth, bool prefix, bool circumfix, bool caseVariant)
         {
             // TODO: just pass this in from before, no need to decode it twice
             affixReader.Position = 8 * affix;
@@ -378,7 +624,7 @@ namespace Lucene.Net.Analysis.Hunspell
             Int32sRef forms = dictionary.LookupWord(strippedWord, 0, length);
             if (forms != null)
             {
-                for (int i = 0; i < forms.Length; i++)
+                for (int i = 0; i < forms.Length; i += formStep)
                 {
                     dictionary.flagLookup.Get(forms.Int32s[forms.Offset + i], scratch);
                     char[] wordFlags = Dictionary.DecodeFlags(scratch);
@@ -410,7 +656,18 @@ namespace Lucene.Net.Analysis.Hunspell
                                 continue;
                             }
                         }
-                        stems.Add(NewStem(strippedWord, length));
+
+                        // we are looking for a case variant, but this word does not allow it
+                        if (caseVariant && dictionary.keepcase != -1 && Dictionary.HasFlag(wordFlags, (char)dictionary.keepcase))
+                        {
+                            continue;
+                        }
+                        // we aren't decompounding (yet)
+                        if (dictionary.onlyincompound != -1 && Dictionary.HasFlag(wordFlags, (char)dictionary.onlyincompound))
+                        {
+                            continue;
+                        }
+                        stems.Add(NewStem(strippedWord, length, forms, i));
                     }
                 }
             }
@@ -432,14 +689,14 @@ namespace Lucene.Net.Analysis.Hunspell
                         // we took away the first prefix.
                         // COMPLEXPREFIXES = true:  combine with a second prefix and another suffix 
                         // COMPLEXPREFIXES = false: combine with a suffix
-                        stems.AddRange(Stem(strippedWord, length, affix, flag, flag, ++recursionDepth, dictionary.complexPrefixes && dictionary.twoStageAffix, true, true, circumfix));
+                        stems.AddRange(Stem(strippedWord, length, affix, flag, flag, ++recursionDepth, dictionary.complexPrefixes && dictionary.twoStageAffix, true, true, circumfix, caseVariant));
                     }
                     else if (dictionary.complexPrefixes == false && dictionary.twoStageAffix)
                     {
                         // we took away a suffix.
                         // COMPLEXPREFIXES = true: we don't recurse! only one suffix allowed
                         // COMPLEXPREFIXES = false: combine with another suffix
-                        stems.AddRange(Stem(strippedWord, length, affix, flag, prefixFlag, ++recursionDepth, false, true, false, circumfix));
+                        stems.AddRange(Stem(strippedWord, length, affix, flag, prefixFlag, ++recursionDepth, false, true, false, circumfix, caseVariant));
                     }
                 }
                 else if (recursionDepth == 1)
@@ -447,12 +704,12 @@ namespace Lucene.Net.Analysis.Hunspell
                     if (prefix && dictionary.complexPrefixes)
                     {
                         // we took away the second prefix: go look for another suffix
-                        stems.AddRange(Stem(strippedWord, length, affix, flag, flag, ++recursionDepth, false, true, true, circumfix));
+                        stems.AddRange(Stem(strippedWord, length, affix, flag, flag, ++recursionDepth, false, true, true, circumfix, caseVariant));
                     }
                     else if (prefix == false && dictionary.complexPrefixes == false && dictionary.twoStageAffix)
                     {
                         // we took away a prefix, then a suffix: go look for another suffix
-                        stems.AddRange(Stem(strippedWord, length, affix, flag, prefixFlag, ++recursionDepth, false, true, false, circumfix));
+                        stems.AddRange(Stem(strippedWord, length, affix, flag, prefixFlag, ++recursionDepth, false, true, false, circumfix, caseVariant));
                     }
                 }
             }
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Foo.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Foo.cs
new file mode 100644
index 0000000..467d181
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Foo.cs
@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Lucene.Net.Analysis.Hunspell
+{
+    class Foo
+    {
+    }
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
index 0b3db96..ce9854f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Test64kAffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Test64kAffixes.cs
new file mode 100644
index 0000000..700f0d2
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/Test64kAffixes.cs
@@ -0,0 +1,69 @@
+// Lucene version compatibility level 4.10.4
+using J2N;
+using Lucene.Net.Util;
+using NUnit.Framework;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+namespace Lucene.Net.Analysis.Hunspell
+{
+    /*
+     * 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.
+     */
+
+    // Tests that > 64k affixes actually works and doesnt overflow some internal int
+    public class Test64kAffixes : LuceneTestCase
+    {
+        [Test]
+        public void Test()
+        {
+            DirectoryInfo tempDir = CreateTempDir("64kaffixes");
+            FileInfo affix = new FileInfo(System.IO.Path.Combine(tempDir.FullName, "64kaffixes.aff"));
+            FileInfo dict = new FileInfo(System.IO.Path.Combine(tempDir.FullName, "64kaffixes.dic"));
+
+            using var affixWriter = new StreamWriter(
+                new FileStream(affix.FullName, FileMode.OpenOrCreate), Encoding.UTF8);
+
+            // 65k affixes with flag 1, then an affix with flag 2
+            affixWriter.Write("SET UTF-8\nFLAG num\nSFX 1 Y 65536\n");
+            for (int i = 0; i < 65536; i++)
+            {
+                affixWriter.Write("SFX 1 0 " + i.ToHexString() + " .\n");
+            }
+            affixWriter.Write("SFX 2 Y 1\nSFX 2 0 s\n");
+            affixWriter.Dispose();
+
+            using var dictWriter = new StreamWriter(
+                new FileStream(dict.FullName, FileMode.OpenOrCreate), Encoding.UTF8);
+
+
+            // drink signed with affix 2 (takes -s)
+            dictWriter.Write("1\ndrink/2\n");
+            dictWriter.Dispose();
+
+            using Stream affStream = new FileStream(affix.FullName, FileMode.OpenOrCreate);
+            using Stream dictStream = new FileStream(dict.FullName, FileMode.OpenOrCreate);
+
+            Dictionary dictionary = new Dictionary(affStream, dictStream);
+            Stemmer stemmer = new Stemmer(dictionary);
+            // drinks should still stem to drink
+            IList<CharsRef> stems = stemmer.Stem("drinks");
+            assertEquals(1, stems.size());
+            assertEquals("drink", stems[0].ToString());
+        }
+    }
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
index 5b1c387..f19734f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using NUnit.Framework;
@@ -195,7 +195,7 @@ namespace Lucene.Net.Analysis.Hunspell
         [Test]
         public virtual void TestOneDictionary()
         {
-            string toTest = "hu_HU.zip";
+            string toTest = "zu_ZA.zip";
             for (int i = 0; i < tests.Length; i++)
             {
                 if (tests[i].Equals(toTest, StringComparison.Ordinal))
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
index 2d187b2..a05e8d9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using NUnit.Framework;
@@ -54,7 +54,7 @@ namespace Lucene.Net.Analysis.Hunspell
             "afrikaans_spell_checker-20110323-fx+tb+fn+sm.xpi",                               "dictionaries/af-ZA.dic",             "dictionaries/af-ZA.aff",
             "albanisches_worterbuch-1.6.9-fx+tb+sm+fn.xpi",                                   "dictionaries/sq.dic",                "dictionaries/sq.aff",
             "amharic_spell_checker-0.4-fx+fn+tb+sm.xpi",                                      "dictionaries/am_ET.dic",             "dictionaries/am_ET.aff",
-//LUCENENET BUG: duplicate mapping of character "arabic_spell_checking_dictionary-3.2.20120321-fx+tb.xpi",                        "dictionaries/ar.dic",                "dictionaries/ar.aff",
+            "arabic_spell_checking_dictionary-3.2.20120321-fx+tb.xpi",                        "dictionaries/ar.dic",                "dictionaries/ar.aff",
             "armenian_spell_checker_dictionary-0.32-fx+tb+sm.xpi",                            "dictionaries/hy_AM.dic",             "dictionaries/hy_AM.aff",
             "azerbaijani_spell_checker-0.3-fx+tb+fn+sm+sb.xpi",                               "dictionaries/az-Latn-AZ.dic",        "dictionaries/az-Latn-AZ.aff",
             "belarusian_classic_dictionary-0.1.2-tb+fx+sm.xpi",                               "dictionaries/be-classic.dic",        "dictionaries/be-classic.aff",
@@ -111,7 +111,7 @@ namespace Lucene.Net.Analysis.Hunspell
             "hausa_spelling_dictionary-0.2-tb+fx.xpi",                                        "dictionaries/ha-GH.dic",             "dictionaries/ha-GH.aff",
             "hebrew_spell_checking_dictionary_from_hspell-1.2.0.1-fx+sm+tb.xpi",              "dictionaries/he.dic",                "dictionaries/he.aff",
             "hindi_spell_checker-0.4-fx+tb+sm+sb+fn.xpi",                                     "dictionaries/hi_IN.dic",             "dictionaries/hi_IN.aff",
-//LUCENENET BUG: Invalid ICONV flag "hungarian_dictionary-1.6.1.1-fx+tb+sm+fn.xpi",                                   "dictionaries/hu.dic",                "dictionaries/hu.aff",
+            "hungarian_dictionary-1.6.1.1-fx+tb+sm+fn.xpi",                                   "dictionaries/hu.dic",                "dictionaries/hu.aff",
 //BUG: has no encoding declaration "icelandic_dictionary-1.3-fx+tb+sm.xpi",                                          "dictionaries/is.dic",                "dictionaries/is.aff",
             "kamus_pengecek_ejaan_bahasa_indonesia-1.1-fx+tb.xpi",                            "dictionaries/id.dic",                "dictionaries/id.aff",
             "kannada_spell_checker-2.0.1-tb+sm+fn+an+fx.xpi",                                 "dictionaries/kn.dic",                "dictionaries/kn.aff",
@@ -146,7 +146,7 @@ namespace Lucene.Net.Analysis.Hunspell
             "slovar_za_slovenski_jezik-0.1.1.1-fx+tb+sm.xpi",                                 "dictionaries/sl.dic",                "dictionaries/sl.aff",
             "songhay_spell_checker-0.03-fx+tb+sm.xpi",                                        "dictionaries/Songhay - Mali.dic",    "dictionaries/Songhay - Mali.aff",
             "southern_sotho_spell_checker-20110323-tb+fn+fx+sm.xpi",                          "dictionaries/st-ZA.dic",             "dictionaries/st-ZA.aff",
-//LUCENENET BUG: Invalid ICONV flag "sownik_acinski-0.41.20110603-tb+fx+sm.xpi",                                      "dictionaries/la.dic",                "dictionaries/la.aff",
+            "sownik_acinski-0.41.20110603-tb+fx+sm.xpi",                                      "dictionaries/la.dic",                "dictionaries/la.aff",
             "sownik_jezyka_dolnouzyckiego-1.4.8-an+fx+tb+fn+sm.xpi",                          "dictionaries/dsb.dic",               "dictionaries/dsb.aff",
             "srpska_latinica-0.1-fx+tb+sm.xpi",                                               "dictionaries/Srpski_latinica.dic",   "dictionaries/Srpski_latinica.aff",
             "svenska_fria_ordlistan-1.1-tb+sm+fx.xpi",                                        "dictionaries/sv.dic",                "dictionaries/sv.aff",
@@ -171,12 +171,11 @@ namespace Lucene.Net.Analysis.Hunspell
             "verificador_ortografico_para_portugues_do_brasil-2.3-3.2b1-tb+sm+fn+fx.xpi",     "dictionaries/pt_BR.dic",             "dictionaries/pt_BR.aff",
             "vietnamese_dictionary-2.1.0.159-an+sm+tb+fx+fn.xpi",                             "dictionaries/vi-DauCu.dic",          "dictionaries/vi-DauCu.aff",
             "vietnamese_dictionary-2.1.0.159-an+sm+tb+fx+fn.xpi",                             "dictionaries/vi-DauMoi.dic",         "dictionaries/vi-DauMoi.aff",
-            "woordenboek_nederlands-3.1.1-sm+tb+fx+fn.xpi",                                   "dictionaries/nl.dic",                "dictionaries/nl.aff",
+// LUCENENET BUG: System.ArgumentException : expected only one flag, got: Kc            "woordenboek_nederlands-3.1.1-sm+tb+fx+fn.xpi",                                   "dictionaries/nl.dic",                "dictionaries/nl.aff",
             "xhosa_spell_checker-20110323-tb+fn+fx+sm.xpi",                                   "dictionaries/xh-ZA.dic",             "dictionaries/xh-ZA.aff",
             "xuxen-4.0.1-fx+tb+sm.xpi",                                                       "dictionaries/eu.dic",                "dictionaries/eu.aff",
             "yiddish_spell_checker_yivo-0.0.3-sm+fn+fx+tb.xpi",                               "dictionaries/yi.dic",                "dictionaries/yi.aff",
             "zulu_spell_checker-20110323-tb+fn+fx+sm.xpi",                                    "dictionaries/zu-ZA.dic",             "dictionaries/zu-ZA.aff",
-
         };
 
         [Test]
@@ -211,9 +210,7 @@ namespace Lucene.Net.Analysis.Hunspell
         [Test]
         public virtual void TestOneDictionary()
         {
-            //string toTest = "hungarian_dictionary-1.6.1.1-fx+tb+sm+fn.xpi";
-            // LUCENENET: We can't test Hungarian because of an invalid flag. Switching to Lithuanian.
-            string toTest = "lithuanian_spelling_check_dictionary-1.3-fx+tb+sm+fn.xpi";
+            string toTest = "hungarian_dictionary-1.6.1.1-fx+tb+sm+fn.xpi";
             for (int i = 0; i < tests.Length; i++)
             {
                 if (tests[i].Equals(toTest, StringComparison.Ordinal))
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
new file mode 100644
index 0000000..33294b7
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAlternateCasing.cs
@@ -0,0 +1,67 @@
+// Lucene version compatibility level 4.10.4
+using NUnit.Framework;
+
+namespace Lucene.Net.Analysis.Hunspell
+{
+    /*
+     * 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.
+     */
+
+    public class TestAlternateCasing : StemmerTestBase
+    {
+        public override void BeforeClass()
+        {
+            base.BeforeClass();
+            Init("alternate-casing.aff", "alternate-casing.dic");
+        }
+
+        [Test]
+        public void TestPossibilities()
+        {
+            AssertStemsTo("drink", "drink");
+            AssertStemsTo("DRİNK", "drink");
+            AssertStemsTo("DRINK");
+            AssertStemsTo("drinki", "drink");
+            AssertStemsTo("DRİNKİ", "drink");
+            AssertStemsTo("DRİNKI");
+            AssertStemsTo("DRINKI");
+            AssertStemsTo("DRINKİ");
+            AssertStemsTo("idrink", "drink");
+            AssertStemsTo("İDRİNK", "drink");
+            AssertStemsTo("IDRİNK");
+            AssertStemsTo("IDRINK");
+            AssertStemsTo("İDRINK");
+            AssertStemsTo("idrinki", "drink");
+            AssertStemsTo("İDRİNKİ", "drink");
+            AssertStemsTo("rıver", "rıver");
+            AssertStemsTo("RIVER", "rıver");
+            AssertStemsTo("RİVER");
+            AssertStemsTo("rıverı", "rıver");
+            AssertStemsTo("RIVERI", "rıver");
+            AssertStemsTo("RİVERI");
+            AssertStemsTo("RİVERİ");
+            AssertStemsTo("RIVERİ");
+            AssertStemsTo("ırıver", "rıver");
+            AssertStemsTo("IRIVER", "rıver");
+            AssertStemsTo("IRİVER");
+            AssertStemsTo("İRİVER");
+            AssertStemsTo("İRIVER");
+            AssertStemsTo("ırıverı", "rıver");
+            AssertStemsTo("IRIVERI", "rıver");
+            AssertStemsTo("Irıverı", "rıver");
+        }
+    }
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
index 141cc9b..dddd520 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
new file mode 100644
index 0000000..fcdd361
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseSensitive.cs
@@ -0,0 +1,71 @@
+// Lucene version compatibility level 4.10.4
+using NUnit.Framework;
+
+namespace Lucene.Net.Analysis.Hunspell
+{
+    /*
+     * 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.
+     */
+
+    public class TestCaseSensitive : StemmerTestBase
+    {
+        public override void BeforeClass()
+        {
+            base.BeforeClass();
+            Init("casesensitive.aff", "casesensitive.dic");
+        }
+
+        [Test]
+        public void TestAllPossibilities()
+        {
+            AssertStemsTo("drink", "drink");
+            AssertStemsTo("drinks", "drink");
+            AssertStemsTo("drinkS", "drink");
+            AssertStemsTo("gooddrinks", "drink");
+            AssertStemsTo("Gooddrinks", "drink", "drink");
+            AssertStemsTo("GOODdrinks", "drink");
+            AssertStemsTo("gooddrinkS", "drink");
+            AssertStemsTo("GooddrinkS", "drink");
+            AssertStemsTo("gooddrink", "drink");
+            AssertStemsTo("Gooddrink", "drink", "drink");
+            AssertStemsTo("GOODdrink", "drink");
+            AssertStemsTo("Drink", "drink", "Drink");
+            AssertStemsTo("Drinks", "drink", "Drink");
+            AssertStemsTo("DrinkS", "Drink");
+            AssertStemsTo("goodDrinks", "Drink");
+            AssertStemsTo("GoodDrinks", "Drink");
+            AssertStemsTo("GOODDrinks", "Drink");
+            AssertStemsTo("goodDrinkS", "Drink");
+            AssertStemsTo("GoodDrinkS", "Drink");
+            AssertStemsTo("GOODDrinkS", "Drink");
+            AssertStemsTo("goodDrink", "Drink");
+            AssertStemsTo("GoodDrink", "Drink");
+            AssertStemsTo("GOODDrink", "Drink");
+            AssertStemsTo("DRINK", "DRINK", "drink", "Drink");
+            AssertStemsTo("DRINKs", "DRINK");
+            AssertStemsTo("DRINKS", "DRINK", "drink", "Drink");
+            AssertStemsTo("goodDRINKs", "DRINK");
+            AssertStemsTo("GoodDRINKs", "DRINK");
+            AssertStemsTo("GOODDRINKs", "DRINK");
+            AssertStemsTo("goodDRINKS", "DRINK");
+            AssertStemsTo("GoodDRINKS", "DRINK");
+            AssertStemsTo("GOODDRINKS", "DRINK", "drink", "drink");
+            AssertStemsTo("goodDRINK", "DRINK");
+            AssertStemsTo("GoodDRINK", "DRINK");
+            AssertStemsTo("GOODDRINK", "DRINK", "drink", "drink");
+        }
+    }
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
index be6b464..c54b741 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
index de47da9..63db496 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
index 4bc54d4..a4e5c94 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
similarity index 80%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
index 4d120e8..186f3ca 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition2.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,18 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestCondition2 : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("condition2.aff", "condition2.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("monopolies", "monopoly");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
index fe3e44f..912cb9c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
index 2f34243..cdfd87e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs
index 71e42fe..4b85b2d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using J2N.Text;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Fst;
@@ -9,7 +9,6 @@ using System.Text;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
-
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
      * contributor license agreements.  See the NOTICE file distributed with
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
similarity index 80%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
index 4d120e8..c376766 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDoubleEscape.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,18 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestDoubleEscape : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("double-escaped.aff", "double-escaped.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("adubo", "adubar");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
index df41107..4b77694 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
index 4da446f..31baf60 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -34,6 +34,7 @@ namespace Lucene.Net.Analysis.Hunspell
             AssertStemsTo("foo", "foo");
             AssertStemsTo("foos", "foo");
             AssertStemsTo("fooss");
+            AssertStemsTo("foobogus");
         }
     }
 }
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
index 180e5fd..b82036d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
similarity index 80%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
index 4d120e8..4d66ec3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFullStrip.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,18 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestFullStrip : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("fullstrip.aff", "fullstrip.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("tasty", "beer");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
index 4d120e8..272a47e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index 56cc591..f1228a0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs
index f6359e4..2171e02 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
index 22de6b7..35fafdb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
similarity index 63%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
index fcd840d..f0a81cc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestKeepCase.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,23 +20,31 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestTwoSuffixes : StemmerTestBase
+    public class TestKeepCase : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("twosuffixes.aff", "twosuffixes.dic");
+            Init("keepcase.aff", "keepcase.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestPossibilities()
         {
             AssertStemsTo("drink", "drink");
-            AssertStemsTo("drinkable", "drink");
+            AssertStemsTo("Drink", "drink");
+            AssertStemsTo("DRINK", "drink");
             AssertStemsTo("drinks", "drink");
-            AssertStemsTo("drinkableable");
-            AssertStemsTo("drinkss");
+            AssertStemsTo("Drinks", "drink");
+            AssertStemsTo("DRINKS", "drink");
+            AssertStemsTo("walk", "walk");
+            AssertStemsTo("walks", "walk");
+            AssertStemsTo("Walk");
+            AssertStemsTo("Walks");
+            AssertStemsTo("WALKS");
+            AssertStemsTo("test", "test");
+            AssertStemsTo("Test");
+            AssertStemsTo("TEST");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
index b8eef84..9fccba1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
similarity index 63%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
index 4d120e8..20a7258 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphAlias.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,25 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestMorphAlias : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("morphalias.aff", "morphalias.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("feet", "foot");
+            AssertStemsTo("feetscratcher", "foot");
+            AssertStemsTo("work", "workverb", "worknoun");
+            AssertStemsTo("works", "workverb", "worknoun");
+            AssertStemsTo("notspecial", "notspecial");
+            AssertStemsTo("simplenoun", "simplenoun");
+            AssertStemsTo("simplenouns", "simplenoun");
+            AssertStemsTo("simplenounscratcher");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
similarity index 63%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
index 4d120e8..0978fc3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorphData.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,25 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestMorphData : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("morphdata.aff", "morphdata.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("feet", "foot");
+            AssertStemsTo("feetscratcher", "foot");
+            AssertStemsTo("work", "workverb", "worknoun");
+            AssertStemsTo("works", "workverb", "worknoun");
+            AssertStemsTo("notspecial", "notspecial");
+            AssertStemsTo("simplenoun", "simplenoun");
+            AssertStemsTo("simplenouns", "simplenoun");
+            AssertStemsTo("simplenounscratcher");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
similarity index 69%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
index fcd840d..8ac9aa7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestNeedAffix.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,23 +20,27 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestTwoSuffixes : StemmerTestBase
+    public class TestNeedAffix : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("twosuffixes.aff", "twosuffixes.dic");
+            Init("needaffix.aff", "needaffix.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestPossibilities()
         {
             AssertStemsTo("drink", "drink");
-            AssertStemsTo("drinkable", "drink");
             AssertStemsTo("drinks", "drink");
-            AssertStemsTo("drinkableable");
-            AssertStemsTo("drinkss");
+            AssertStemsTo("walk");
+            AssertStemsTo("walks", "walk");
+            AssertStemsTo("prewalk", "walk");
+            AssertStemsTo("prewalks", "walk");
+            AssertStemsTo("test");
+            AssertStemsTo("pretest");
+            AssertStemsTo("tests");
+            AssertStemsTo("pretests");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
similarity index 76%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
index fcd840d..d9700aa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOnlyInCompound.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,23 +20,23 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestTwoSuffixes : StemmerTestBase
+    public class TestOnlyInCompound : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("twosuffixes.aff", "twosuffixes.dic");
+            Init("onlyincompound.aff", "onlyincompound.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestPossibilities()
         {
             AssertStemsTo("drink", "drink");
-            AssertStemsTo("drinkable", "drink");
             AssertStemsTo("drinks", "drink");
-            AssertStemsTo("drinkableable");
-            AssertStemsTo("drinkss");
+            AssertStemsTo("drinked");
+            AssertStemsTo("predrink");
+            AssertStemsTo("predrinked");
+            AssertStemsTo("walk");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
index 50deba0..94b9a14 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
similarity index 59%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
index 4bc54d4..2aebb8e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestSpaces.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,30 +20,29 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestCondition : StemmerTestBase
+    public class TestSpaces : StemmerTestBase
     {
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("condition.aff", "condition.dic");
+            Init("spaces.aff", "spaces.dic");
         }
 
         [Test]
-        public virtual void TestStemming()
+        public void TestStemming()
         {
-            AssertStemsTo("hello", "hello");
-            AssertStemsTo("try", "try");
-            AssertStemsTo("tried", "try");
-            AssertStemsTo("work", "work");
-            AssertStemsTo("worked", "work");
-            AssertStemsTo("rework", "work");
-            AssertStemsTo("reworked", "work");
-            AssertStemsTo("retried");
-            AssertStemsTo("workied");
-            AssertStemsTo("tryed");
-            AssertStemsTo("tryied");
-            AssertStemsTo("helloed");
+            AssertStemsTo("four", "four");
+            AssertStemsTo("fours", "four");
+            AssertStemsTo("five", "five");
+            AssertStemsTo("forty four", "forty four");
+            AssertStemsTo("forty fours", "forty four");
+            AssertStemsTo("forty five", "forty five");
+            AssertStemsTo("fifty", "50");
+            AssertStemsTo("fiftys", "50");
+            AssertStemsTo("sixty", "60");
+            AssertStemsTo("sixty four", "64");
+            AssertStemsTo("fifty four", "54");
+            AssertStemsTo("fifty fours", "54");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
index 84cd54b..4a56814 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
similarity index 74%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
index 4d120e8..730d242 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStrangeOvergeneration.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,21 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestStrangeOvergeneration : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("strange-overgeneration.aff", "strange-overgeneration.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("btasty", "beer");
+            AssertStemsTo("tasty");
+            AssertStemsTo("yuck");
+            AssertStemsTo("foo");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
index 9ce1fc9..fdbad8a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
index fcd840d..8749522 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
similarity index 80%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
index 4d120e8..e032155 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,18 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestZeroAffix : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("zeroaffix.aff", "zeroaffix.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("drink", "drinksierranevada");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
similarity index 80%
copy from src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
copy to src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
index 4d120e8..b22f186 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestZeroAffix2.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.10.4
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
@@ -20,19 +20,18 @@ namespace Lucene.Net.Analysis.Hunspell
      * limitations under the License.
      */
 
-    public class TestHomonyms : StemmerTestBase
+    public class TestZeroAffix2 : StemmerTestBase
     {
-
-        [OneTimeSetUp]
         public override void BeforeClass()
         {
             base.BeforeClass();
-            Init("homonyms.aff", "homonyms.dic");
+            Init("zeroaffix2.aff", "zeroaffix2.dic");
         }
+
         [Test]
-        public virtual void TestExamples()
+        public void TestStemming()
         {
-            AssertStemsTo("works", "work", "work");
+            AssertStemsTo("b", "beer");
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.aff
new file mode 100644
index 0000000..49618b8
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.aff
@@ -0,0 +1,15 @@
+SET UTF-8
+
+LANG tr_TR
+
+PFX A Y 1
+PFX A 0 ı . +dotlessprefix
+
+PFX B Y 1
+PFX B 0 i . +dottedprefix
+
+SFX X Y 1
+SFX X 0 ı . +dotlesssuffix
+
+SFX Y Y 1
+SFX Y 0 i . +dottedsuffix
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.dic
new file mode 100644
index 0000000..5b7c8f4
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/alternate-casing.dic
@@ -0,0 +1,4 @@
+3
+drink/BY
+rıver/AX
+
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.aff
new file mode 100644
index 0000000..9943e62
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.aff
@@ -0,0 +1,16 @@
+SET UTF-8
+
+PFX A Y 1
+PFX A 0 good . +good
+
+PFX B Y 1
+PFX B 0 Good . +Good
+
+PFX C Y 1
+PFX C 0 GOOD . +GOOD
+
+SFX X Y 1
+SFX X 0 s . +s
+
+SFX Y Y 1
+SFX Y 0 S . +S
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.dic
new file mode 100644
index 0000000..edbc34c
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/casesensitive.dic
@@ -0,0 +1,4 @@
+3
+drink/XYABC
+Drink/XYABC
+DRINK/XYABC
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/circumfix.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/circumfix.dic
index 571e2e2..0295762 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/circumfix.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/circumfix.dic
@@ -1,2 +1,2 @@
 1
-nagy/C    [MN]
+nagy/C	[MN]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.aff
new file mode 100644
index 0000000..8e06a21
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.aff
@@ -0,0 +1,5 @@
+SET ISO8859-1
+TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ'
+
+SFX S Y 1
+SFX S   y     ies        [^aeiou]y
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.dic
new file mode 100644
index 0000000..72a8c3e
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition2.dic
@@ -0,0 +1,2 @@
+1
+monopoly/S
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/conv.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/conv.dic
index 6b68dc8..169e17f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/conv.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/conv.dic
@@ -1,2 +1,2 @@
 1
-drink/X   [VERB]
+drink/X	[VERB]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/dependencies.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/dependencies.dic
index bdba45e..ade5437 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/dependencies.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/dependencies.dic
@@ -1,3 +1,3 @@
 2
-drink/RQ  [verb]
-drink/S   [noun]
+drink/RQ	[verb]
+drink/S	[noun]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.aff
new file mode 100644
index 0000000..ab74afa
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.aff
@@ -0,0 +1,5 @@
+SET UTF-8
+
+SFX X Y 1
+SFX X   ar         o          [^\-]ar
+
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.dic
new file mode 100644
index 0000000..42ddb5e
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/double-escaped.dic
@@ -0,0 +1,2 @@
+1
+adubar/X
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/flaglong.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/flaglong.aff
index d05a5da..fb0f423 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/flaglong.aff
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/flaglong.aff
@@ -2,3 +2,6 @@ SET UTF-8
 FLAG long
 SFX Y1 Y 1
 SFX Y1 0 s .
+
+SFX 1Y Y 1
+SFX 1Y 0 bogus .
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.aff
new file mode 100644
index 0000000..9c2de7f
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.aff
@@ -0,0 +1,6 @@
+SET UTF-8
+
+FULLSTRIP
+
+SFX A Y 1
+SFX A   beer        tasty  .
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.dic
new file mode 100644
index 0000000..c948f18
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/fullstrip.dic
@@ -0,0 +1,2 @@
+1
+beer/A
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/homonyms.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/homonyms.dic
index 96d51f1..6357472 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/homonyms.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/homonyms.dic
@@ -1,3 +1,3 @@
 2
-work/A    [VERB]
-work/B    [NOUN]
\ No newline at end of file
+work/A	[VERB]
+work/B	[NOUN]
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/ignore.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/ignore.dic
index 9ae9205..854c509 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/ignore.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/ignore.dic
@@ -1,3 +1,3 @@
 1
-drink/X   [VERB]
-dr-ank/X  [VERB]
\ No newline at end of file
+drink/X	[VERB]
+dr-ank/X	[VERB]
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.aff
new file mode 100644
index 0000000..4b56950
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.aff
@@ -0,0 +1,6 @@
+SET UTF-8
+
+KEEPCASE Z
+
+SFX X Y 1
+SFX X 0 s . +s
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.dic
new file mode 100644
index 0000000..96b7a48
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/keepcase.dic
@@ -0,0 +1,4 @@
+3
+drink/X
+walk/XZ
+test/Z
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morph.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morph.dic
index 6b68dc8..169e17f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morph.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morph.dic
@@ -1,2 +1,2 @@
 1
-drink/X   [VERB]
+drink/X	[VERB]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.aff
new file mode 100644
index 0000000..f408f3f
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.aff
@@ -0,0 +1,16 @@
+AM 4
+AM st:foot
+AM    st:workverb  
+AM   st:worknoun
+AM po:garbage
+
+SET UTF-8
+
+SFX X Y 1
+SFX X 0 scratcher .
+
+SFX A Y 1
+SFX A 0 s . +SG3
+
+SFX B Y 1
+SFX B 0 s . +PLUR
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.dic
new file mode 100644
index 0000000..638a2bd
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphalias.dic
@@ -0,0 +1,6 @@
+5
+feet/X	1
+work/A	2  
+work/B	3
+notspecial	4
+simplenoun/A
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.aff
new file mode 100644
index 0000000..0448cd7
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.aff
@@ -0,0 +1,10 @@
+SET UTF-8
+
+SFX X Y 1
+SFX X 0 scratcher .
+
+SFX A Y 1
+SFX A 0 s . +SG3
+
+SFX B Y 1
+SFX B 0 s . +PLUR
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.dic
new file mode 100644
index 0000000..9b7cc9d
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/morphdata.dic
@@ -0,0 +1,6 @@
+5
+feet/X st:foot
+work/A    st:workverb  
+work/B    st:worknoun
+notspecial
+simplenoun/A
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.aff
new file mode 100644
index 0000000..ea6c41f
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.aff
@@ -0,0 +1,9 @@
+SET UTF-8
+
+NEEDAFFIX Z
+
+PFX Y Y 1
+PFX Y 0 pre . pre+
+
+SFX X Y 1
+SFX X 0 s . +s
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.dic
new file mode 100644
index 0000000..3ac76bd
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/needaffix.dic
@@ -0,0 +1,4 @@
+3
+drink/X
+walk/XYZ
+test/Z
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.aff
new file mode 100644
index 0000000..91fc80f
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.aff
@@ -0,0 +1,12 @@
+SET UTF-8
+
+ONLYINCOMPOUND A
+
+PFX Y Y 1
+PFX Y 0 pre/A . pre+
+
+SFX X Y 1
+SFX X 0 s . +s
+
+SFX Z Y 1
+SFX Z 0 ed/A . +ed
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.dic
new file mode 100644
index 0000000..8e7b025
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/onlyincompound.dic
@@ -0,0 +1,4 @@
+2
+drink/XYZ
+walk/A
+
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.aff
new file mode 100644
index 0000000..3f2365e
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.aff
@@ -0,0 +1,5 @@
+SET UTF-8
+TRY abcdefghijklmopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ
+
+SFX X Y 1
+SFX X 0 s . +PLUR
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.dic
new file mode 100644
index 0000000..11294ae
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/spaces.dic
@@ -0,0 +1,9 @@
+4
+four/X po:number
+five po:number
+forty four/X po:number
+forty five po:number
+fifty/X st:50
+sixty st:60
+sixty four st:64
+fifty four/X st:54
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.aff
new file mode 100644
index 0000000..470b570
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.aff
@@ -0,0 +1,10 @@
+SET UTF-8
+
+SFX A Y 1
+SFX A   baz        yuck         baz
+
+SFX B Y 1
+SFX B   bar        foo    .
+
+SFX C Y 1
+SFX C   eer        tasty  .
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.dic
new file mode 100644
index 0000000..e4b61b3
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/strange-overgeneration.dic
@@ -0,0 +1,5 @@
+3
+baz/A
+bar/B
+beer/C
+eer/C
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/twosuffixes.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/twosuffixes.dic
index 6b68dc8..169e17f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/twosuffixes.dic
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/twosuffixes.dic
@@ -1,2 +1,2 @@
 1
-drink/X   [VERB]
+drink/X	[VERB]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.aff
new file mode 100644
index 0000000..52c36f7
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.aff
@@ -0,0 +1,4 @@
+SET UTF-8
+
+SFX X Y 1
+SFX X sierranevada 0 .
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.dic
new file mode 100644
index 0000000..92c08d0
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix.dic
@@ -0,0 +1,2 @@
+1
+drinksierranevada/X	[VERB]
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.aff
new file mode 100644
index 0000000..72e273f
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.aff
@@ -0,0 +1,6 @@
+SET UTF-8
+FLAG num
+
+SFX 322 Y 1
+SFX 322 eer 0/100 .
+
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.dic
new file mode 100644
index 0000000..4171564
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/zeroaffix2.dic
@@ -0,0 +1,2 @@
+1
+beer/322
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index 58188ec..dac5f852 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -25,6 +25,7 @@
 
   <PropertyGroup>
     <AssemblyTitle>Lucene.Net.Tests.Analysis.Common</AssemblyTitle>
+    <RootNamespace>Lucene.Net</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>
@@ -36,6 +37,37 @@
   </ItemGroup>
 
   <ItemGroup>
+    <None Remove="Analysis\Hunspell\alternate-casing.aff" />
+    <None Remove="Analysis\Hunspell\alternate-casing.dic" />
+    <None Remove="Analysis\Hunspell\casesensitive.aff" />
+    <None Remove="Analysis\Hunspell\casesensitive.dic" />
+    <None Remove="Analysis\Hunspell\condition2.aff" />
+    <None Remove="Analysis\Hunspell\condition2.dic" />
+    <None Remove="Analysis\Hunspell\double-escaped.aff" />
+    <None Remove="Analysis\Hunspell\double-escaped.dic" />
+    <None Remove="Analysis\Hunspell\fullstrip.aff" />
+    <None Remove="Analysis\Hunspell\fullstrip.dic" />
+    <None Remove="Analysis\Hunspell\keepcase.aff" />
+    <None Remove="Analysis\Hunspell\keepcase.dic" />
+    <None Remove="Analysis\Hunspell\morphalias.aff" />
+    <None Remove="Analysis\Hunspell\morphalias.dic" />
+    <None Remove="Analysis\Hunspell\morphdata.aff" />
+    <None Remove="Analysis\Hunspell\morphdata.dic" />
+    <None Remove="Analysis\Hunspell\needaffix.aff" />
+    <None Remove="Analysis\Hunspell\needaffix.dic" />
+    <None Remove="Analysis\Hunspell\onlyincompound.aff" />
+    <None Remove="Analysis\Hunspell\onlyincompound.dic" />
+    <None Remove="Analysis\Hunspell\spaces.aff" />
+    <None Remove="Analysis\Hunspell\spaces.dic" />
+    <None Remove="Analysis\Hunspell\strange-overgeneration.aff" />
+    <None Remove="Analysis\Hunspell\strange-overgeneration.dic" />
+    <None Remove="Analysis\Hunspell\zeroaffix.aff" />
+    <None Remove="Analysis\Hunspell\zeroaffix.dic" />
+    <None Remove="Analysis\Hunspell\zeroaffix2.aff" />
+    <None Remove="Analysis\Hunspell\zeroaffix2.dic" />
+  </ItemGroup>
+
+  <ItemGroup>
     <ProjectReference Include="..\Lucene.Net.Analysis.Common\Lucene.Net.Analysis.Common.csproj" />
     <ProjectReference Include="..\Lucene.Net.TestFramework\Lucene.Net.TestFramework.csproj" />
   </ItemGroup>
@@ -43,7 +75,12 @@
   <Import Project="$(SolutionDir)build/TestReferences.Common.targets" />
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)"/>
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
+    <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' ">
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Startup.cs b/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
index 3d830d4..a9502ca 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -23,4 +23,10 @@ using Lucene.Net.Util;
 // would not occur if it were not here.
 public class Startup : LuceneTestFrameworkInitializer
 {
+    protected override void TestFrameworkSetUp()
+    {
+#if FEATURE_ENCODINGPROVIDERS
+        System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
+#endif
+    }
 }
\ No newline at end of file


[lucenenet] 02/08: SWEEP: Lucene.Net.Tests.Analysis.Common: Added Lucene version compatibility level 4.8.1 comment at the top of each file

Posted by ni...@apache.org.
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 890d94b94f31d845bbe3ef056cbcbc788a4e075d
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Feb 23 22:52:18 2021 +0700

    SWEEP: Lucene.Net.Tests.Analysis.Common: Added Lucene version compatibility level 4.8.1 comment at the top of each file
---
 .../Analysis/Ar/TestArabicAnalyzer.cs                                | 3 ++-
 .../Analysis/Ar/TestArabicFilters.cs                                 | 3 ++-
 .../Analysis/Ar/TestArabicLetterTokenizer.cs                         | 3 ++-
 .../Analysis/Ar/TestArabicNormalizationFilter.cs                     | 3 ++-
 .../Analysis/Ar/TestArabicStemFilter.cs                              | 3 ++-
 .../Analysis/Bg/TestBulgarianAnalyzer.cs                             | 3 ++-
 .../Analysis/Bg/TestBulgarianStemFilterFactory.cs                    | 3 ++-
 .../Analysis/Bg/TestBulgarianStemmer.cs                              | 3 ++-
 .../Analysis/Br/TestBrazilianStemFilterFactory.cs                    | 3 ++-
 .../Analysis/Br/TestBrazilianStemmer.cs                              | 3 ++-
 .../Analysis/Ca/TestCatalanAnalyzer.cs                               | 3 ++-
 .../Analysis/CharFilters/HTMLStripCharFilterTest.cs                  | 1 +
 .../Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs           | 3 ++-
 .../Analysis/CharFilters/TestMappingCharFilter.cs                    | 3 ++-
 .../Analysis/CharFilters/TestMappingCharFilterFactory.cs             | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs | 3 ++-
 .../Analysis/Cjk/TestCJKBigramFilter.cs                              | 3 ++-
 .../Analysis/Cjk/TestCJKBigramFilterFactory.cs                       | 3 ++-
 .../Analysis/Cjk/TestCJKTokenizer.cs                                 | 3 ++-
 .../Analysis/Cjk/TestCJKTokenizerFactory.cs                          | 3 ++-
 .../Analysis/Cjk/TestCJKWidthFilter.cs                               | 3 ++-
 .../Analysis/Cjk/TestCJKWidthFilterFactory.cs                        | 3 ++-
 .../Analysis/Ckb/TestSoraniAnalyzer.cs                               | 3 ++-
 .../Analysis/Ckb/TestSoraniNormalizationFilter.cs                    | 3 ++-
 .../Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs             | 3 ++-
 .../Analysis/Ckb/TestSoraniStemFilter.cs                             | 3 ++-
 .../Analysis/Ckb/TestSoraniStemFilterFactory.cs                      | 3 ++-
 .../Analysis/Cn/TestChineseFilterFactory.cs                          | 3 ++-
 .../Analysis/Cn/TestChineseTokenizer.cs                              | 3 ++-
 .../Analysis/Cn/TestChineseTokenizerFactory.cs                       | 3 ++-
 .../Analysis/Commongrams/CommonGramsFilterTest.cs                    | 3 ++-
 .../Analysis/Commongrams/TestCommonGramsFilterFactory.cs             | 3 ++-
 .../Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs        | 3 ++-
 .../Analysis/Compound/TestCompoundWordTokenFilter.cs                 | 3 ++-
 .../Compound/TestDictionaryCompoundWordTokenFilterFactory.cs         | 3 ++-
 .../Compound/TestHyphenationCompoundWordTokenFilterFactory.cs        | 3 ++-
 .../Analysis/Core/TestAllAnalyzersHaveFactories.cs                   | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs  | 3 ++-
 .../Analysis/Core/TestBugInSomething.cs                              | 3 ++-
 .../Analysis/Core/TestClassicAnalyzer.cs                             | 3 ++-
 .../Analysis/Core/TestDuelingAnalyzers.cs                            | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs  | 3 ++-
 .../Analysis/Core/TestKeywordAnalyzer.cs                             | 3 ++-
 .../Analysis/Core/TestRandomChains.cs                                | 3 ++-
 .../Analysis/Core/TestStandardAnalyzer.cs                            | 3 ++-
 .../Analysis/Core/TestStopAnalyzer.cs                                | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs | 3 ++-
 .../Analysis/Core/TestStopFilterFactory.cs                           | 3 ++-
 .../Analysis/Core/TestTypeTokenFilter.cs                             | 3 ++-
 .../Analysis/Core/TestTypeTokenFilterFactory.cs                      | 3 ++-
 .../Analysis/Core/TestUAX29URLEmailAnalyzer.cs                       | 3 ++-
 .../Analysis/Core/TestUAX29URLEmailTokenizer.cs                      | 3 ++-
 .../Analysis/Core/WordBreakTestUnicode_6_3_0.cs                      | 3 ++-
 .../Analysis/Cz/TestCzechAnalyzer.cs                                 | 3 ++-
 .../Analysis/Cz/TestCzechStemFilterFactory.cs                        | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemmer.cs | 3 ++-
 .../Analysis/Da/TestDanishAnalyzer.cs                                | 3 ++-
 .../Analysis/De/TestGermanAnalyzer.cs                                | 3 ++-
 .../Analysis/De/TestGermanLightStemFilter.cs                         | 3 ++-
 .../Analysis/De/TestGermanLightStemFilterFactory.cs                  | 3 ++-
 .../Analysis/De/TestGermanMinimalStemFilter.cs                       | 3 ++-
 .../Analysis/De/TestGermanMinimalStemFilterFactory.cs                | 3 ++-
 .../Analysis/De/TestGermanNormalizationFilter.cs                     | 3 ++-
 .../Analysis/De/TestGermanNormalizationFilterFactory.cs              | 3 ++-
 .../Analysis/De/TestGermanStemFilter.cs                              | 3 ++-
 .../Analysis/De/TestGermanStemFilterFactory.cs                       | 3 ++-
 .../Analysis/El/GreekAnalyzerTest.cs                                 | 3 ++-
 .../Analysis/El/TestGreekLowerCaseFilterFactory.cs                   | 3 ++-
 .../Analysis/El/TestGreekStemFilterFactory.cs                        | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemmer.cs | 3 ++-
 .../Analysis/En/TestEnglishAnalyzer.cs                               | 3 ++-
 .../Analysis/En/TestEnglishMinimalStemFilter.cs                      | 3 ++-
 .../Analysis/En/TestEnglishMinimalStemFilterFactory.cs               | 3 ++-
 .../Analysis/En/TestKStemFilterFactory.cs                            | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs     | 3 ++-
 .../Analysis/En/TestPorterStemFilter.cs                              | 3 ++-
 .../Analysis/En/TestPorterStemFilterFactory.cs                       | 3 ++-
 .../Analysis/Es/TestSpanishAnalyzer.cs                               | 3 ++-
 .../Analysis/Es/TestSpanishLightStemFilter.cs                        | 3 ++-
 .../Analysis/Es/TestSpanishLightStemFilterFactory.cs                 | 3 ++-
 .../Analysis/Eu/TestBasqueAnalyzer.cs                                | 3 ++-
 .../Analysis/Fa/TestPersianAnalyzer.cs                               | 3 ++-
 .../Analysis/Fa/TestPersianCharFilter.cs                             | 3 ++-
 .../Analysis/Fa/TestPersianNormalizationFilter.cs                    | 3 ++-
 .../Analysis/Fa/TestPersianNormalizationFilterFactory.cs             | 3 ++-
 .../Analysis/Fi/TestFinnishAnalyzer.cs                               | 3 ++-
 .../Analysis/Fi/TestFinnishLightStemFilter.cs                        | 3 ++-
 .../Analysis/Fi/TestFinnishLightStemFilterFactory.cs                 | 3 ++-
 .../Analysis/Fr/TestFrenchAnalyzer.cs                                | 3 ++-
 .../Analysis/Fr/TestFrenchLightStemFilter.cs                         | 3 ++-
 .../Analysis/Fr/TestFrenchLightStemFilterFactory.cs                  | 3 ++-
 .../Analysis/Fr/TestFrenchMinimalStemFilter.cs                       | 3 ++-
 .../Analysis/Fr/TestFrenchMinimalStemFilterFactory.cs                | 3 ++-
 .../Analysis/Ga/TestIrishAnalyzer.cs                                 | 3 ++-
 .../Analysis/Ga/TestIrishLowerCaseFilter.cs                          | 3 ++-
 .../Analysis/Ga/TestIrishLowerCaseFilterFactory.cs                   | 3 ++-
 .../Analysis/Gl/TestGalicianAnalyzer.cs                              | 3 ++-
 .../Analysis/Gl/TestGalicianMinimalStemFilter.cs                     | 3 ++-
 .../Analysis/Gl/TestGalicianMinimalStemFilterFactory.cs              | 3 ++-
 .../Analysis/Gl/TestGalicianStemFilter.cs                            | 3 ++-
 .../Analysis/Gl/TestGalicianStemFilterFactory.cs                     | 3 ++-
 .../Analysis/Hi/TestHindiAnalyzer.cs                                 | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiFilters.cs | 3 ++-
 .../Analysis/Hi/TestHindiNormalizer.cs                               | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiStemmer.cs | 3 ++-
 .../Analysis/Hu/TestHungarianAnalyzer.cs                             | 3 ++-
 .../Analysis/Hu/TestHungarianLightStemFilter.cs                      | 3 ++-
 .../Analysis/Hu/TestHungarianLightStemFilterFactory.cs               | 3 ++-
 .../Analysis/Hunspell/StemmerTestBase.cs                             | 3 ++-
 .../Analysis/Hunspell/TestAllDictionaries.cs                         | 3 ++-
 .../Analysis/Hunspell/TestAllDictionaries2.cs                        | 3 ++-
 .../Analysis/Hunspell/TestCaseInsensitive.cs                         | 3 ++-
 .../Analysis/Hunspell/TestCircumfix.cs                               | 3 ++-
 .../Analysis/Hunspell/TestComplexPrefix.cs                           | 3 ++-
 .../Analysis/Hunspell/TestCondition.cs                               | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs   | 3 ++-
 .../Analysis/Hunspell/TestDependencies.cs                            | 3 ++-
 .../Analysis/Hunspell/TestDictionary.cs                              | 3 ++-
 .../Analysis/Hunspell/TestEscaped.cs                                 | 3 ++-
 .../Analysis/Hunspell/TestFlagLong.cs                                | 3 ++-
 .../Analysis/Hunspell/TestFlagNum.cs                                 | 3 ++-
 .../Analysis/Hunspell/TestHomonyms.cs                                | 3 ++-
 .../Analysis/Hunspell/TestHunspellStemFilter.cs                      | 3 ++-
 .../Analysis/Hunspell/TestHunspellStemFilterFactory.cs               | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs  | 3 ++-
 .../Analysis/Hunspell/TestOptionalCondition.cs                       | 3 ++-
 .../Analysis/Hunspell/TestStemmer.cs                                 | 3 ++-
 .../Analysis/Hunspell/TestTwoFold.cs                                 | 3 ++-
 .../Analysis/Hunspell/TestTwoSuffixes.cs                             | 3 ++-
 .../Analysis/Hy/TestArmenianAnalyzer.cs                              | 3 ++-
 .../Analysis/Id/TestIndonesianAnalyzer.cs                            | 3 ++-
 .../Analysis/Id/TestIndonesianStemFilterFactory.cs                   | 3 ++-
 .../Analysis/Id/TestIndonesianStemmer.cs                             | 3 ++-
 .../Analysis/In/TestIndicNormalizer.cs                               | 3 ++-
 .../Analysis/It/TestItalianAnalyzer.cs                               | 3 ++-
 .../Analysis/It/TestItalianLightStemFilter.cs                        | 3 ++-
 .../Analysis/It/TestItalianLightStemFilterFactory.cs                 | 3 ++-
 .../Analysis/Lv/TestLatvianAnalyzer.cs                               | 3 ++-
 .../Analysis/Lv/TestLatvianStemFilterFactory.cs                      | 3 ++-
 .../Analysis/Lv/TestLatvianStemmer.cs                                | 3 ++-
 .../Analysis/Miscellaneous/PatternAnalyzerTest.cs                    | 3 ++-
 .../Analysis/Miscellaneous/TestASCIIFoldingFilter.cs                 | 3 ++-
 .../Analysis/Miscellaneous/TestCapitalizationFilter.cs               | 3 ++-
 .../Analysis/Miscellaneous/TestCapitalizationFilterFactory.cs        | 3 ++-
 .../Analysis/Miscellaneous/TestCodepointCountFilter.cs               | 3 ++-
 .../Analysis/Miscellaneous/TestCodepointCountFilterFactory.cs        | 3 ++-
 .../Analysis/Miscellaneous/TestEmptyTokenStream.cs                   | 3 ++-
 .../Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs              | 3 ++-
 .../Analysis/Miscellaneous/TestKeepFilterFactory.cs                  | 3 ++-
 .../Analysis/Miscellaneous/TestKeepWordFilter.cs                     | 3 ++-
 .../Analysis/Miscellaneous/TestKeywordMarkerFilter.cs                | 3 ++-
 .../Analysis/Miscellaneous/TestKeywordMarkerFilterFactory.cs         | 3 ++-
 .../Analysis/Miscellaneous/TestKeywordRepeatFilter.cs                | 3 ++-
 .../Analysis/Miscellaneous/TestLengthFilter.cs                       | 3 ++-
 .../Analysis/Miscellaneous/TestLengthFilterFactory.cs                | 3 ++-
 .../Analysis/Miscellaneous/TestLimitTokenCountAnalyzer.cs            | 3 ++-
 .../Analysis/Miscellaneous/TestLimitTokenCountFilter.cs              | 3 ++-
 .../Analysis/Miscellaneous/TestLimitTokenCountFilterFactory.cs       | 3 ++-
 .../Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs           | 3 ++-
 .../Analysis/Miscellaneous/TestLimitTokenPositionFilterFactory.cs    | 3 ++-
 .../Analysis/Miscellaneous/TestLucene47WordDelimiterFilter.cs        | 3 ++-
 .../Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs            | 3 ++-
 .../Analysis/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs    | 3 ++-
 .../Analysis/Miscellaneous/TestPrefixAwareTokenFilter.cs             | 3 ++-
 .../Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs        | 3 ++-
 .../Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilterFactory.cs | 3 ++-
 .../Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs          | 3 ++-
 .../Analysis/Miscellaneous/TestScandinavianFoldingFilterFactory.cs   | 3 ++-
 .../Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs    | 3 ++-
 .../Miscellaneous/TestScandinavianNormalizationFilterFactory.cs      | 3 ++-
 .../Analysis/Miscellaneous/TestSingleTokenTokenFilter.cs             | 3 ++-
 .../Analysis/Miscellaneous/TestStemmerOverrideFilter.cs              | 3 ++-
 .../Analysis/Miscellaneous/TestStemmerOverrideFilterFactory.cs       | 3 ++-
 .../Analysis/Miscellaneous/TestTrimFilter.cs                         | 3 ++-
 .../Analysis/Miscellaneous/TestTrimFilterFactory.cs                  | 3 ++-
 .../Analysis/Miscellaneous/TestTruncateTokenFilter.cs                | 3 ++-
 .../Analysis/Miscellaneous/TestTruncateTokenFilterFactory.cs         | 3 ++-
 .../Analysis/Miscellaneous/TestWordDelimiterFilter.cs                | 3 ++-
 .../Analysis/NGram/EdgeNGramTokenFilterTest.cs                       | 3 ++-
 .../Analysis/NGram/EdgeNGramTokenizerTest.cs                         | 3 ++-
 .../Analysis/NGram/NGramTokenFilterTest.cs                           | 3 ++-
 .../Analysis/NGram/NGramTokenizerTest.cs                             | 3 ++-
 .../Analysis/NGram/TestNGramFilters.cs                               | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs | 3 ++-
 .../Analysis/No/TestNorwegianAnalyzer.cs                             | 3 ++-
 .../Analysis/No/TestNorwegianLightStemFilter.cs                      | 3 ++-
 .../Analysis/No/TestNorwegianLightStemFilterFactory.cs               | 3 ++-
 .../Analysis/No/TestNorwegianMinimalStemFilter.cs                    | 3 ++-
 .../Analysis/No/TestNorwegianMinimalStemFilterFactory.cs             | 3 ++-
 .../Analysis/Path/TestPathHierarchyTokenizer.cs                      | 3 ++-
 .../Analysis/Path/TestReversePathHierarchyTokenizer.cs               | 3 ++-
 .../Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs           | 3 ++-
 .../Analysis/Pattern/TestPatternReplaceCharFilter.cs                 | 3 ++-
 .../Analysis/Pattern/TestPatternReplaceCharFilterFactory.cs          | 3 ++-
 .../Analysis/Pattern/TestPatternReplaceFilter.cs                     | 3 ++-
 .../Analysis/Pattern/TestPatternReplaceFilterFactory.cs              | 3 ++-
 .../Analysis/Pattern/TestPatternTokenizer.cs                         | 3 ++-
 .../Analysis/Pattern/TestPatternTokenizerFactory.cs                  | 3 ++-
 .../Analysis/Payloads/DelimitedPayloadTokenFilterTest.cs             | 3 ++-
 .../Analysis/Payloads/NumericPayloadTokenFilterTest.cs               | 3 ++-
 .../Analysis/Payloads/TestDelimitedPayloadTokenFilterFactory.cs      | 3 ++-
 .../Analysis/Payloads/TokenOffsetPayloadTokenFilterTest.cs           | 3 ++-
 .../Analysis/Payloads/TypeAsPayloadTokenFilterTest.cs                | 3 ++-
 .../Analysis/Position/PositionFilterTest.cs                          | 3 ++-
 .../Analysis/Pt/TestPortugueseAnalyzer.cs                            | 3 ++-
 .../Analysis/Pt/TestPortugueseLightStemFilter.cs                     | 3 ++-
 .../Analysis/Pt/TestPortugueseLightStemFilterFactory.cs              | 3 ++-
 .../Analysis/Pt/TestPortugueseMinimalStemFilter.cs                   | 3 ++-
 .../Analysis/Pt/TestPortugueseMinimalStemFilterFactory.cs            | 3 ++-
 .../Analysis/Pt/TestPortugueseStemFilter.cs                          | 3 ++-
 .../Analysis/Pt/TestPortugueseStemFilterFactory.cs                   | 3 ++-
 .../Analysis/Query/QueryAutoStopWordAnalyzerTest.cs                  | 3 ++-
 .../Analysis/Reverse/TestReverseStringFilter.cs                      | 3 ++-
 .../Analysis/Reverse/TestReverseStringFilterFactory.cs               | 3 ++-
 .../Analysis/Ro/TestRomanianAnalyzer.cs                              | 3 ++-
 .../Analysis/Ru/TestRussianAnalyzer.cs                               | 3 ++-
 .../Analysis/Ru/TestRussianFilters.cs                                | 3 ++-
 .../Analysis/Ru/TestRussianLetterTokenizer.cs                        | 3 ++-
 .../Analysis/Ru/TestRussianLightStemFilter.cs                        | 3 ++-
 .../Analysis/Ru/TestRussianLightStemFilterFactory.cs                 | 3 ++-
 .../Analysis/Shingle/ShingleAnalyzerWrapperTest.cs                   | 3 ++-
 .../Analysis/Shingle/ShingleFilterTest.cs                            | 3 ++-
 .../Analysis/Shingle/TestShingleFilterFactory.cs                     | 3 ++-
 .../Analysis/Sinks/DateRecognizerSinkTokenizerTest.cs                | 3 ++-
 .../Analysis/Sinks/TestTeeSinkTokenFilter.cs                         | 3 ++-
 .../Analysis/Sinks/TokenRangeSinkTokenizerTest.cs                    | 3 ++-
 .../Analysis/Sinks/TokenTypeSinkTokenizerTest.cs                     | 3 ++-
 .../Analysis/Snowball/TestSnowball.cs                                | 3 ++-
 .../Analysis/Snowball/TestSnowballPorterFilterFactory.cs             | 3 ++-
 .../Analysis/Snowball/TestSnowballVocab.cs                           | 3 ++-
 .../Analysis/Standard/TestStandardFactories.cs                       | 3 ++-
 .../Analysis/Standard/TestUAX29URLEmailTokenizerFactory.cs           | 3 ++-
 .../Analysis/Sv/TestSwedishAnalyzer.cs                               | 3 ++-
 .../Analysis/Sv/TestSwedishLightStemFilter.cs                        | 3 ++-
 .../Analysis/Sv/TestSwedishLightStemFilterFactory.cs                 | 3 ++-
 .../Analysis/Synonym/TestMultiWordSynonyms.cs                        | 3 ++-
 .../Analysis/Synonym/TestSlowSynonymFilter.cs                        | 3 ++-
 .../Analysis/Synonym/TestSolrSynonymParser.cs                        | 3 ++-
 .../Analysis/Synonym/TestSynonymFilterFactory.cs                     | 3 ++-
 .../Analysis/Synonym/TestSynonymMap.cs                               | 3 ++-
 .../Analysis/Synonym/TestSynonymMapFilter.cs                         | 3 ++-
 .../Analysis/Synonym/TestWordnetSynonymParser.cs                     | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs | 1 +
 .../Analysis/Th/TestThaiTokenizerFactory.cs                          | 3 ++-
 .../Analysis/Th/TestThaiWordFilterFactory.cs                         | 3 ++-
 .../Analysis/Tr/TestApostropheFilter.cs                              | 3 ++-
 .../Analysis/Tr/TestApostropheFilterFactory.cs                       | 3 ++-
 .../Analysis/Tr/TestTurkishAnalyzer.cs                               | 3 ++-
 .../Analysis/Tr/TestTurkishLowerCaseFilter.cs                        | 3 ++-
 .../Analysis/Tr/TestTurkishLowerCaseFilterFactory.cs                 | 3 ++-
 .../Analysis/Util/BaseTokenStreamFactoryTestCase.cs                  | 3 ++-
 .../Analysis/Util/StringMockResourceLoader.cs                        | 3 ++-
 .../Analysis/Util/TestAnalysisSPILoader.cs                           | 3 ++-
 .../Analysis/Util/TestBufferedCharFilter.cs                          | 5 +++--
 .../Analysis/Util/TestCharArrayIterator.cs                           | 3 ++-
 .../Analysis/Util/TestCharArrayMap.cs                                | 3 ++-
 .../Analysis/Util/TestCharArraySet.cs                                | 3 ++-
 .../Analysis/Util/TestCharTokenizers.cs                              | 3 ++-
 .../Analysis/Util/TestCharacterUtils.cs                              | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElision.cs    | 3 ++-
 .../Analysis/Util/TestElisionFilterFactory.cs                        | 3 ++-
 .../Analysis/Util/TestFilesystemResourceLoader.cs                    | 3 ++-
 .../Analysis/Util/TestRollingCharBuffer.cs                           | 3 ++-
 .../Analysis/Util/TestSegmentingTokenizerBase.cs                     | 1 +
 .../Analysis/Util/TestWordlistLoader.cs                              | 3 ++-
 .../Analysis/Wikipedia/TestWikipediaTokenizerFactory.cs              | 3 ++-
 .../Analysis/Wikipedia/WikipediaTokenizerTest.cs                     | 3 ++-
 .../Collation/TestCollationKeyAnalyzer.cs                            | 3 ++-
 .../Collation/TestCollationKeyFilter.cs                              | 3 ++-
 .../Collation/TestCollationKeyFilterFactory.cs                       | 3 ++-
 src/Lucene.Net.Tests.Analysis.Common/Startup.cs                      | 5 +++--
 src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs   | 3 ++-
 .../Support/TestExceptionSerialization.cs                            | 3 ++-
 274 files changed, 547 insertions(+), 273 deletions(-)

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs
index 53de3b4..65f4169 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ar
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicFilters.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicFilters.cs
index 92a3c55..a17c32a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicFilters.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicFilters.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicLetterTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicLetterTokenizer.cs
index 44cc37c..92fdb06 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicLetterTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicLetterTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicNormalizationFilter.cs
index d3cc0cc..05fcff5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicStemFilter.cs
index 4aa55f0..daf2892 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ar/TestArabicStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs
index e6f2609..87e50e4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Bg
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemFilterFactory.cs
index 425996f..1ddc978 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemmer.cs
index ae664dd..783edc8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Bg/TestBulgarianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemFilterFactory.cs
index 0b92712..1283f97 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs
index 07b3f2c..9a12b97 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Br/TestBrazilianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs
index a763ff2..3e904a4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ca/TestCatalanAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ca
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs
index b8278f5..8c18fd7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/HTMLStripCharFilterTest.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using J2N.Text;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs
index 3e6ba29..8d3598d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestHTMLStripCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs
index 91967c1..ea6dfe3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilterFactory.cs
index afe5b8c..ca31d64 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/CharFilters/TestMappingCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs
index a98de4d..13bfcca 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs
index abed201..b9b7f76 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using NUnit.Framework;
 using System;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilterFactory.cs
index ac84b9a..613b7ef 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKBigramFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using NUnit.Framework;
 using Lucene.Net.Analysis.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs
index 0ff988d..487f5e5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizerFactory.cs
index 7b780f1..81e7f2c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizerFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs
index dfba7a1..44fc984 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Cjk
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilterFactory.cs
index 9cae015..f0027ab 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cjk/TestCJKWidthFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs
index 49d7742..48e2812 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ckb
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilter.cs
index 8b8217c..f4b50a9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ckb
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs
index b98d6ab..81e33d9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilter.cs
index 5157450..9f9625b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ckb
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilterFactory.cs
index 234d8ab..29e0862 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ckb/TestSoraniStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseFilterFactory.cs
index 45e0366..03b49d3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 using NUnit.Framework;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs
index 00145b5..fcbc115 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 using NUnit.Framework;
 using Lucene.Net.Analysis.Core;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizerFactory.cs
index 0643ef3..73eab10 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizerFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cn/TestChineseTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 using NUnit.Framework;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs
index 8a19769..449f6e4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/CommonGramsFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs
index c8152f2..cee44af 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs
index 3496a65..8a8ac55 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Commongrams/TestCommonGramsQueryFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs
index d62b59d..251f762 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestCompoundWordTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using Lucene.Net.Analysis.Compound.Hyphenation;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestDictionaryCompoundWordTokenFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestDictionaryCompoundWordTokenFilterFactory.cs
index 95a3aad..a3c5be2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestDictionaryCompoundWordTokenFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestDictionaryCompoundWordTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.IO;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestHyphenationCompoundWordTokenFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestHyphenationCompoundWordTokenFilterFactory.cs
index 15a3136..d56a291 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestHyphenationCompoundWordTokenFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Compound/TestHyphenationCompoundWordTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs
index 63d79cf..c85525d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAllAnalyzersHaveFactories.cs
@@ -1,4 +1,5 @@
-using J2N.Runtime.CompilerServices;
+// Lucene version compatibility level 4.8.1
+using J2N.Runtime.CompilerServices;
 using Lucene.Net.Analysis.Fr;
 using Lucene.Net.Analysis.In;
 using Lucene.Net.Analysis.Miscellaneous;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
index d7919fd..a0fc24a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestAnalyzers.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
index dab7c1b..dcc392a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestBugInSomething.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using Lucene.Net.Analysis.CommonGrams;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.NGram;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs
index 9997422..d673019 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestClassicAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Search;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs
index 38e8473..b61b22d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestDuelingAnalyzers.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Automaton;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs
index 43b0365..9647c42 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestFactories.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
index 4ad984e..5403cae 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestKeywordAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Search;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
index 656dba5..4258434 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestRandomChains.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 
 using J2N.Runtime.CompilerServices;
 using J2N.Text;
@@ -1170,4 +1171,4 @@ namespace Lucene.Net.Analysis.Core
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs
index 7e5b4f6..ee03139 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStandardAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
index 547ac29..8918530 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs
index b34bb2a..2acebb7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs
index 9b774ae..55b31d5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestStopFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs
index dc66a27..dd9d64b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilterFactory.cs
index b324d6b..9ed5793 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestTypeTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs
index 624f811..acae076 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs
index e0645b6..8ec637c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/TestUAX29URLEmailTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/WordBreakTestUnicode_6_3_0.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/WordBreakTestUnicode_6_3_0.cs
index 422bd1a..02de2c1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/WordBreakTestUnicode_6_3_0.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Core/WordBreakTestUnicode_6_3_0.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Core
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Core
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs
index accfea8..8ad713f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemFilterFactory.cs
index 2f5ed53..d584b97 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemmer.cs
index 2c46162..d36b221 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Cz/TestCzechStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs
index aa22fce..df85cfb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Da/TestDanishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Da
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs
index 0bf5aa4..bae8101 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs
index 4c6548b..bc057d6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilterFactory.cs
index 0f97c33..8686407 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs
index a840cb1..98a5639 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilterFactory.cs
index d6aac7a..4409f29 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs
index 63dc648..774169f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.De
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilterFactory.cs
index 8d3a66a..343d9c9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs
index 1145e38..916305f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilterFactory.cs
index 0a9c3bd..0db1e64 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/De/TestGermanStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs
index b6010b8..13156ee 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/GreekAnalyzerTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekLowerCaseFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekLowerCaseFilterFactory.cs
index c309c50..9034ca4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekLowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekLowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemFilterFactory.cs
index 565d137..117cdcd 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemmer.cs
index c46b149..dfdf7b5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/El/TestGreekStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.El
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs
index 4566df9..5ac6148 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.En
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs
index e33b5e4..a07da3a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilterFactory.cs
index 487cfe1..26563f7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestEnglishMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemFilterFactory.cs
index 0484082..7ad473a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs
index 5a3658a..3cc9595 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestKStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.En
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs
index 8b55e22..6290c3a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilterFactory.cs
index 1e948a4..986c4e2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/En/TestPorterStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs
index 924fc0f..adf3a14 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Es
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs
index 335b8ff..ce5eeb0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Es
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilterFactory.cs
index 68193b5..7f69ba2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Es/TestSpanishLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs
index 6f9f47d..80458f0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Eu/TestBasqueAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Eu
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs
index e4a1124..d97ca90 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Fa
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs
index ea1fcaa..b7624ae 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianCharFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Fa
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilter.cs
index 7a515f5..9d6ae2c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Ar;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Ar;
 using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilterFactory.cs
index 22e1dbf..523b198 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fa/TestPersianNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs
index 7d9cdf0..15aae2e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Fi
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs
index 06a4174..c52b6b8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilterFactory.cs
index 83c45ed..10e3ac9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fi/TestFinnishLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs
index 07d4d1e..b6ff3d6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs
index b2e51a8..7e83d2e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilterFactory.cs
index 364f64e..02814da 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs
index cd9cb0d..dd80e29 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilterFactory.cs
index 9f58b90..b9a37e1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Fr/TestFrenchMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs
index 34de7b7..d1e23e0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ga
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilter.cs
index d78d64b..1ec380f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilterFactory.cs
index 6b22b6d..a3e4ba5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ga/TestIrishLowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs
index ddc5d90..30b89a7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Gl
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs
index feb874c..29ade69 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilterFactory.cs
index 62be5ce..7a0f8e2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilter.cs
index 093fccd..a882366 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using NUnit.Framework;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilterFactory.cs
index d874b38..39ef0e2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Gl/TestGalicianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs
index 7722abc..c070375 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hi
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiFilters.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiFilters.cs
index 0ce13c7..1d6b161 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiFilters.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiFilters.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiNormalizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiNormalizer.cs
index c448b41..c069862 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiNormalizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiStemmer.cs
index 89bd7cf..efd2af9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hi/TestHindiStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs
index 80dce07..4d636b4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hu
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilter.cs
index 76392b5..f5aa61c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilterFactory.cs
index 3b694cd..b7b5236 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hu/TestHungarianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
index 4a6498a..0b3db96 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/StemmerTestBase.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
index 8773f51..5b1c387 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
index 1568b3b..2d187b2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
index 3cbbfce..141cc9b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCaseInsensitive.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
index 5a632e3..be6b464 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCircumfix.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
index 34a8922..de47da9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestComplexPrefix.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
index 6a8cc31..4bc54d4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestCondition.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
index 064eb88..fe3e44f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConv.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
index ce2ebb4..2f34243 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDependencies.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs
index 33123e7..71e42fe 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestDictionary.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Fst;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
index aad8076..df41107 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestEscaped.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
index 1f2332f..4da446f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagLong.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
index 268947e..180e5fd 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestFlagNum.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
index ac50272..4d120e8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHomonyms.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
index 0528b8c..56cc591 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs
index 706488d..f6359e4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestHunspellStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
index d04bb66..22de6b7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestIgnore.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
index f6c28b5..b8eef84 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestMorph.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
index 8c58205..50deba0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestOptionalCondition.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
index 6a46ada..84cd54b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestStemmer.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
index 25e109c..9ce1fc9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoFold.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
index d969b6b..fcd840d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestTwoSuffixes.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hunspell
 {
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs
index 4bba84c..f989e3c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hy/TestArmenianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Hy
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs
index 2c1ccfc..2c9078e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Id
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemFilterFactory.cs
index f41a4e3..f1b9d82 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemmer.cs
index 1e09be9..6ccdb8f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Id/TestIndonesianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Id
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/In/TestIndicNormalizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/In/TestIndicNormalizer.cs
index 83590ca..6eabd72 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/In/TestIndicNormalizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/In/TestIndicNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs
index 3c81ae7..d4fffd2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs
index 7c494dd..31d5d7d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.It
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilterFactory.cs
index e6efaac..a17a4b5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/It/TestItalianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs
index 483949e..22dee2f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Lv
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemFilterFactory.cs
index 55bf72c..1f2af4f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemmer.cs
index 2516bc3..41b3aba 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Lv/TestLatvianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Lv
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs
index d3f0b23..b6a164f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzerTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Support;
 using NUnit.Framework;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs
index 0953dd0..dcd63d2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestASCIIFoldingFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
index 25416b7..a7415aa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilterFactory.cs
index b4e759d..bdbe4ef 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCapitalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
index 6e0e8b0..867694f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilterFactory.cs
index b706def..38fa32e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestCodepointCountFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestEmptyTokenStream.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestEmptyTokenStream.cs
index 9ac2987..54b6137 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestEmptyTokenStream.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestEmptyTokenStream.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs
index b070f2b..4d0c5fa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestHyphenatedWordsFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepFilterFactory.cs
index fb68031..ecc0f35 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs
index 9b5fc13..dd03479 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeepWordFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilter.cs
index 33955c0..30ec853 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System.Globalization;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilterFactory.cs
index 0590e8a..be36b64 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordMarkerFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordRepeatFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordRepeatFilter.cs
index 2f7f0f5..6a1006a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordRepeatFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestKeywordRepeatFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
index 0263637..110fa1e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilterFactory.cs
index 158ada6..5e7aad2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLengthFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountAnalyzer.cs
index eb5ab61..a800d9e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Documents;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
index c7afe50..93d68da 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilterFactory.cs
index 04c9717..f9a818e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenCountFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
index 84f7eb5..596986b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Synonym;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Synonym;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilterFactory.cs
index a6716b4..02adb41 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLimitTokenPositionFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLucene47WordDelimiterFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLucene47WordDelimiterFilter.cs
index 8860e84..3277c3d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLucene47WordDelimiterFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestLucene47WordDelimiterFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
index d05253c..cad2302 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPerFieldAnalyzerWrapper.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.En;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Attributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs
index 8b6ddab..05aa361 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAndSuffixAwareTokenFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAwareTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAwareTokenFilter.cs
index ca80dc7..aa9a3cb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAwareTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestPrefixAwareTokenFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs
index e01e9ea..aa138a9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilter.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Synonym;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilterFactory.cs
index e555500..e63a26b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestRemoveDuplicatesTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs
index 507d839..a14eb92 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilterFactory.cs
index 9f5a308..f1878ef 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianFoldingFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs
index b307cb4..836515a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilterFactory.cs
index 78093f1..ed32817 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestScandinavianNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestSingleTokenTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestSingleTokenTokenFilter.cs
index 5bedab0..971eafd 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestSingleTokenTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestSingleTokenTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
index df2463a..fd13a30 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Collections.Generic.Extensions;
 using J2N.Text;
 using Lucene.Net.Analysis.Core;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilterFactory.cs
index 68ed600..aed217d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestStemmerOverrideFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs
index 79248d4..c04d28d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilter.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilterFactory.cs
index 1d9fa66..a0ae00d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTrimFilterFactory.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 using BaseTokenStreamFactoryTestCase = Lucene.Net.Analysis.Util.BaseTokenStreamFactoryTestCase;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
index 8230537..6709451 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilterFactory.cs
index ee99f16..8597245 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestTruncateTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 using BaseTokenStreamFactoryTestCase = Lucene.Net.Analysis.Util.BaseTokenStreamFactoryTestCase;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
index a003777..2a7f4bd 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Miscellaneous/TestWordDelimiterFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
index e1bfeed..bf9f7d6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilterTest.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Shingle;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
index c162a4b..5117288 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
index ee5be14..5f3d67a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenFilterTest.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
index 42c7669..cbc8b0f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/NGramTokenizerTest.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Text;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Support;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/TestNGramFilters.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/TestNGramFilters.cs
index f98aab8..7d5fe94 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/TestNGramFilters.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/NGram/TestNGramFilters.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs
index c5761cd..310565a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Nl/TestDutchStemmer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using NUnit.Framework;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs
index 2976e45..679aad7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.No
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs
index 01c0be3..2ae40c3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilterFactory.cs
index b002842..c86c885 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs
index 2ffa115..7c543b3 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilterFactory.cs
index f516467..5371d0f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/No/TestNorwegianMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs
index f465d24..02d4e83 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestPathHierarchyTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs
index 016bc37..a44aa8d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Path/TestReversePathHierarchyTokenizer.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs
index b4074b6..281870b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternCaptureGroupTokenFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.IO;
 using System.Text.RegularExpressions;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
index 22c23ce..c27df2e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilterFactory.cs
index 701c71f..a6683f5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs
index 998b7f5..4072ad0 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 using System.Text.RegularExpressions;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilterFactory.cs
index 901ba0b..716b2d5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternReplaceFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs
index 3a6961e..871796b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizerFactory.cs
index 99aeec4..458f612 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizerFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pattern/TestPatternTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterTest.cs
index 124a50b..ea1f26c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterTest.cs
index 2a705ed..b81abd4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TestDelimitedPayloadTokenFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TestDelimitedPayloadTokenFilterFactory.cs
index 81b4278..d9e65dc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TestDelimitedPayloadTokenFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TestDelimitedPayloadTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterTest.cs
index 85cdb07..01d8fee 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterTest.cs
index ffc83cd..237a0a9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
 using System.Globalization;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Position/PositionFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Position/PositionFilterTest.cs
index 5d4def7..38c2b25 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Position/PositionFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Position/PositionFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Shingle;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Shingle;
 using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs
index 76ae875..16ff457 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Pt
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs
index 28121bc..cebd55b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilterFactory.cs
index 73a7007..77d2ecb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs
index 5ae6979..b5d66c9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilterFactory.cs
index 66b6379..fcc31f1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs
index 74a8c8b..985d8d6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilterFactory.cs
index a0e671a..c13b380 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Pt/TestPortugueseStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzerTest.cs
index 4d3419f..01cf0a8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzerTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Documents;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Documents;
 using Lucene.Net.Index;
 using Lucene.Net.Store;
 using Lucene.Net.Support;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs
index e7df335..07c87c1 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilterFactory.cs
index be36c37..7f68c82 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Reverse/TestReverseStringFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs
index 2ae18f2..64336b8 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ro/TestRomanianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Ro
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs
index fb6b247..0bb0e32 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianFilters.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianFilters.cs
index 3576c71..94c630b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianFilters.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianFilters.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLetterTokenizer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLetterTokenizer.cs
index 15a5b07..cef2a84 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLetterTokenizer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLetterTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs
index 63c8af6..19c9762 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilterFactory.cs
index 3a96ca0..7295602 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Ru/TestRussianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
index 2cb1b51..cd9fa26 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapperTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Documents;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
index 8754489..1cf5ad6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/ShingleFilterTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/TestShingleFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/TestShingleFilterFactory.cs
index ad80b09..a5495e2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/TestShingleFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Shingle/TestShingleFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/DateRecognizerSinkTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/DateRecognizerSinkTokenizerTest.cs
index 99856d5..0ddf384 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/DateRecognizerSinkTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/DateRecognizerSinkTokenizerTest.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.Globalization;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
index 33502a8..89a6513 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TestTeeSinkTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Documents;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
index 0bf35db..50a3556 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenRangeSinkTokenizerTest.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenTypeSinkTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenTypeSinkTokenizerTest.cs
index c05212d..53b99af 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenTypeSinkTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sinks/TokenTypeSinkTokenizerTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
index 5b89326..ebcb724 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowball.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Attributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballPorterFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballPorterFilterFactory.cs
index 3caec57..a1544ab 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballPorterFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballPorterFilterFactory.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Tartarus.Snowball.Ext;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
index 3718bf1..4006706 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Snowball/TestSnowballVocab.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using Console = Lucene.Net.Util.SystemConsole;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestStandardFactories.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestStandardFactories.cs
index 7a19605..e30f10f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestStandardFactories.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestStandardFactories.cs
@@ -1,4 +1,5 @@
-using System.Text;
+// Lucene version compatibility level 4.8.1
+using System.Text;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestUAX29URLEmailTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestUAX29URLEmailTokenizerFactory.cs
index 7d8dadb..2b1e3d6 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestUAX29URLEmailTokenizerFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Standard/TestUAX29URLEmailTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs
index d245f01..aed0041 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Sv
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs
index 4d26bd9..e512a3f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilterFactory.cs
index 95a3203..4f27eb9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Sv/TestSwedishLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestMultiWordSynonyms.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestMultiWordSynonyms.cs
index 44e996e..5895ada 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestMultiWordSynonyms.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestMultiWordSynonyms.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs
index 466d441..e5010b2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSlowSynonymFilter.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using J2N.Text;
 using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
index 9c39266..0d5e2d4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSolrSynonymParser.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.En;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.En;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs
index afcac03..27c8ab5 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Pattern;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Pattern;
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs
index b229e07..89e88fa 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMap.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.NGram;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.NGram;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
index ba8d1de..007543b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestSynonymMapFilter.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestWordnetSynonymParser.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestWordnetSynonymParser.cs
index e76b28c..ac8e3ce 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestWordnetSynonymParser.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Synonym/TestWordnetSynonymParser.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Synonym
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs
index 00bfc14..2f7eb79 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiAnalyzer.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 #if FEATURE_BREAKITERATOR
 using J2N.Threading;
 using Lucene.Net.Analysis.Core;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiTokenizerFactory.cs
index f43b057..0f501ae 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiTokenizerFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiTokenizerFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiWordFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiWordFilterFactory.cs
index c79fdfb..93d60ec 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiWordFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Th/TestThaiWordFilterFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilter.cs
index e878928..79899b4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilter.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Tr
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilterFactory.cs
index 7372bf0..05fefeb 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestApostropheFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs
index 6a40bcc..3ba6190 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 
 namespace Lucene.Net.Analysis.Tr
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilter.cs
index 1be40e4..1713d7b 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using NUnit.Framework;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilterFactory.cs
index f2a2ed3..6f1fa9f 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Tr/TestTurkishLowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/BaseTokenStreamFactoryTestCase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/BaseTokenStreamFactoryTestCase.cs
index 8d965ac..9335688 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/BaseTokenStreamFactoryTestCase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/BaseTokenStreamFactoryTestCase.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs
index 3386481..6f55170 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/StringMockResourceLoader.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 using System.Text;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestAnalysisSPILoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestAnalysisSPILoader.cs
index b782958..4cbebf2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestAnalysisSPILoader.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestAnalysisSPILoader.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs
index 309553d..1719709 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs
@@ -1,4 +1,5 @@
-// This class was sourced from the Apache Harmony project
+// Lucene version compatibility level 4.8.1
+// This class was sourced from the Apache Harmony project
 // https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/
 
 using Lucene.Net.Attributes;
@@ -883,4 +884,4 @@ namespace Lucene.Net.Analysis.Util
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayIterator.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayIterator.cs
index 879b6e6..331cf05 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayIterator.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayIterator.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using System;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs
index 14a290a..6521ee2 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArrayMap.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArraySet.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArraySet.cs
index e637483..4d61789 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArraySet.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharArraySet.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
index 4493c32..7e02d55 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharTokenizers.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Text;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharacterUtils.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharacterUtils.cs
index 2cec326..7e093cc 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharacterUtils.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestCharacterUtils.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using NUnit.Framework;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElision.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElision.cs
index 93880f1..39fbf5a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElision.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElision.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Fr;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElisionFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElisionFilterFactory.cs
index feb0742..cc4fb00 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElisionFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestElisionFilterFactory.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
index ec29080..fedf943 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestFilesystemResourceLoader.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Util;
 using NUnit.Framework;
 using System;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
index 04a24d0..1a8a799 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestRollingCharBuffer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using NUnit.Framework;
 using System.IO;
 using Console = Lucene.Net.Util.SystemConsole;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs
index c43abc3..0673e7d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestSegmentingTokenizerBase.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 #if FEATURE_BREAKITERATOR
 using ICU4N.Text;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestWordlistLoader.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestWordlistLoader.cs
index 9df94b0..e3d471e 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestWordlistLoader.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestWordlistLoader.cs
@@ -1,4 +1,5 @@
-using NUnit.Framework;
+// Lucene version compatibility level 4.8.1
+using NUnit.Framework;
 using Lucene.Net.Util;
 using Lucene.Net.Analysis.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/TestWikipediaTokenizerFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/TestWikipediaTokenizerFactory.cs
index de0a7d7..33cf61d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/TestWikipediaTokenizerFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/TestWikipediaTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using NUnit.Framework;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs
index 8bdeadf..f04f8b7 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerTest.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using NUnit.Framework;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
index a621b43..cb80126 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyAnalyzer.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using Icu;
 using Icu.Collation;
 using Lucene.Net.Analysis;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
index c40476a..18c8077 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilter.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using System;
 using System.Globalization;
 using System.IO;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
index 3ba9abd..bfa3aff 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Collation/TestCollationKeyFilterFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Startup.cs b/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
index 9233cac..3d830d4 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
  * 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.
@@ -22,4 +23,4 @@ using Lucene.Net.Util;
 // would not occur if it were not here.
 public class Startup : LuceneTestFrameworkInitializer
 {
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
index d6efdf9..efe8e56 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;
@@ -143,4 +144,4 @@ namespace Lucene.Net.Analysis
             base.TestForMembersAcceptingOrReturningListOrDictionary(typeFromTargetAssembly);
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs b/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs
index 55f5be0..8d9429c 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Support/TestExceptionSerialization.cs
@@ -1,4 +1,5 @@
-#if FEATURE_SERIALIZABLE_EXCEPTIONS
+// Lucene version compatibility level 4.8.1
+#if FEATURE_SERIALIZABLE_EXCEPTIONS
 using Lucene.Net.Attributes;
 using Lucene.Net.Util;
 using NUnit.Framework;


[lucenenet] 05/08: Lucene.Net.Analysis.Common: Added hunspell regression tests for #418

Posted by ni...@apache.org.
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 3254d810dffc5b0ea28d4c008caf841a4f8a8a77
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Feb 21 22:29:52 2021 +0700

    Lucene.Net.Analysis.Common: Added hunspell regression tests for #418
---
 .../Analysis/Hunspell/TestConditionGH418.cs        | 40 ++++++++++++++++++++++
 .../Analysis/Hunspell/condition-issue-418.aff      |  8 +++++
 .../Analysis/Hunspell/condition-issue-418.dic      |  2 ++
 3 files changed, 50 insertions(+)

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs
new file mode 100644
index 0000000..5865d8e
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestConditionGH418.cs
@@ -0,0 +1,40 @@
+using Lucene.Net.Attributes;
+using NUnit.Framework;
+
+namespace Lucene.Net.Analysis.Hunspell
+{
+    /*
+     * 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.
+     */
+
+    [LuceneNetSpecific]
+    public class TestConditionGH418 : StemmerTestBase
+    {
+        [OneTimeSetUp]
+        public override void BeforeClass()
+        {
+            base.BeforeClass();
+            Init("condition-issue-418.aff", "condition-issue-418.dic");
+        }
+
+        [Test]
+        public virtual void TestStemming()
+        {
+            AssertStemsTo("rework", "work");
+            AssertStemsTo("worked", "work");
+        }
+    }
+}
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.aff b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.aff
new file mode 100644
index 0000000..36c2ef0
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.aff
@@ -0,0 +1,8 @@
+SET UTF-8
+TRY esianrtolcdugmphbyfvkwzESIANRTOLCDUGMPHBYFVKWZ’
+
+PFX A Y 1
+PFX A 0 re [w]o
+
+SFX B Y 1
+SFX B 0 ed [r]k
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.dic b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.dic
new file mode 100644
index 0000000..1e5e6e8
--- /dev/null
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/condition-issue-418.dic
@@ -0,0 +1,2 @@
+1
+work/AB
\ No newline at end of file


[lucenenet] 01/08: SWEEP: Lucene.Net.Analysis.Common: Added Lucene version compatibility level 4.8.1 comment at the top of each file

Posted by ni...@apache.org.
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 ca31ca441348f3ef36b956e497edccc9f858af57
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Tue Feb 23 22:47:13 2021 +0700

    SWEEP: Lucene.Net.Analysis.Common: Added Lucene version compatibility level 4.8.1 comment at the top of each file
---
 src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizer.cs  | 3 ++-
 .../Analysis/Ar/ArabicLetterTokenizerFactory.cs                      | 3 ++-
 .../Analysis/Ar/ArabicNormalizationFilter.cs                         | 3 ++-
 .../Analysis/Ar/ArabicNormalizationFilterFactory.cs                  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizer.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilter.cs       | 3 ++-
 .../Analysis/Ar/ArabicStemFilterFactory.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemmer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilter.cs    | 3 ++-
 .../Analysis/Bg/BulgarianStemFilterFactory.cs                        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemmer.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilter.cs    | 3 ++-
 .../Analysis/Br/BrazilianStemFilterFactory.cs                        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemmer.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs | 3 ++-
 .../Analysis/CharFilter/HTMLStripCharFilter.cs                       | 5 +++--
 .../Analysis/CharFilter/HTMLStripCharFilterFactory.cs                | 3 ++-
 .../Analysis/CharFilter/MappingCharFilter.cs                         | 3 ++-
 .../Analysis/CharFilter/MappingCharFilterFactory.cs                  | 3 ++-
 .../Analysis/CharFilter/NormalizeCharMap.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilter.cs       | 3 ++-
 .../Analysis/Cjk/CJKBigramFilterFactory.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizerFactory.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilter.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilterFactory.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs        | 3 ++-
 .../Analysis/Ckb/SoraniNormalizationFilter.cs                        | 3 ++-
 .../Analysis/Ckb/SoraniNormalizationFilterFactory.cs                 | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizer.cs      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilter.cs      | 3 ++-
 .../Analysis/Ckb/SoraniStemFilterFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemmer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilter.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilterFactory.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizer.cs       | 3 ++-
 .../Analysis/Cn/ChineseTokenizerFactory.cs                           | 3 ++-
 .../Analysis/CommonGrams/CommonGramsFilter.cs                        | 3 ++-
 .../Analysis/CommonGrams/CommonGramsFilterFactory.cs                 | 3 ++-
 .../Analysis/CommonGrams/CommonGramsQueryFilter.cs                   | 3 ++-
 .../Analysis/CommonGrams/CommonGramsQueryFilterFactory.cs            | 3 ++-
 .../Analysis/Compound/CompoundWordTokenFilterBase.cs                 | 3 ++-
 .../Analysis/Compound/DictionaryCompoundWordTokenFilter.cs           | 3 ++-
 .../Analysis/Compound/DictionaryCompoundWordTokenFilterFactory.cs    | 3 ++-
 .../Analysis/Compound/Hyphenation/ByteVector.cs                      | 3 ++-
 .../Analysis/Compound/Hyphenation/CharVector.cs                      | 3 ++-
 .../Analysis/Compound/Hyphenation/Hyphen.cs                          | 3 ++-
 .../Analysis/Compound/Hyphenation/Hyphenation.cs                     | 3 ++-
 .../Analysis/Compound/Hyphenation/HyphenationTree.cs                 | 3 ++-
 .../Analysis/Compound/Hyphenation/PatternConsumer.cs                 | 3 ++-
 .../Analysis/Compound/Hyphenation/PatternParser.cs                   | 3 ++-
 .../Analysis/Compound/Hyphenation/TernaryTree.cs                     | 3 ++-
 .../Analysis/Compound/HyphenationCompoundWordTokenFilter.cs          | 3 ++-
 .../Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizer.cs     | 3 ++-
 .../Analysis/Core/KeywordTokenizerFactory.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizer.cs      | 3 ++-
 .../Analysis/Core/LetterTokenizerFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilter.cs      | 3 ++-
 .../Analysis/Core/LowerCaseFilterFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizer.cs   | 3 ++-
 .../Analysis/Core/LowerCaseTokenizerFactory.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilter.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilterFactory.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilter.cs      | 3 ++-
 .../Analysis/Core/TypeTokenFilterFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilter.cs      | 3 ++-
 .../Analysis/Core/UpperCaseFilterFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizer.cs  | 3 ++-
 .../Analysis/Core/WhitespaceTokenizerFactory.cs                      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilter.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilterFactory.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemmer.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilter.cs  | 3 ++-
 .../Analysis/De/GermanLightStemFilterFactory.cs                      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemmer.cs     | 3 ++-
 .../Analysis/De/GermanMinimalStemFilter.cs                           | 3 ++-
 .../Analysis/De/GermanMinimalStemFilterFactory.cs                    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemmer.cs   | 3 ++-
 .../Analysis/De/GermanNormalizationFilter.cs                         | 3 ++-
 .../Analysis/De/GermanNormalizationFilterFactory.cs                  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilter.cs       | 3 ++-
 .../Analysis/De/GermanStemFilterFactory.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemmer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilter.cs   | 3 ++-
 .../Analysis/El/GreekLowerCaseFilterFactory.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilter.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilterFactory.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemmer.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs        | 3 ++-
 .../Analysis/En/EnglishMinimalStemFilter.cs                          | 3 ++-
 .../Analysis/En/EnglishMinimalStemFilterFactory.cs                   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemmer.cs  | 3 ++-
 .../Analysis/En/EnglishPossessiveFilter.cs                           | 3 ++-
 .../Analysis/En/EnglishPossessiveFilterFactory.cs                    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData1.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData2.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData3.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData4.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData5.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData6.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData7.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemData8.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilter.cs            | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilterFactory.cs     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/KStemmer.cs               | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilter.cs       | 3 ++-
 .../Analysis/En/PorterStemFilterFactory.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemmer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilter.cs | 3 ++-
 .../Analysis/Es/SpanishLightStemFilterFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemmer.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilter.cs      | 3 ++-
 .../Analysis/Fa/PersianCharFilterFactory.cs                          | 3 ++-
 .../Analysis/Fa/PersianNormalizationFilter.cs                        | 3 ++-
 .../Analysis/Fa/PersianNormalizationFilterFactory.cs                 | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizer.cs      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilter.cs | 3 ++-
 .../Analysis/Fi/FinnishLightStemFilterFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemmer.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilter.cs  | 3 ++-
 .../Analysis/Fr/FrenchLightStemFilterFactory.cs                      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemmer.cs     | 3 ++-
 .../Analysis/Fr/FrenchMinimalStemFilter.cs                           | 3 ++-
 .../Analysis/Fr/FrenchMinimalStemFilterFactory.cs                    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemmer.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemFilter.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemmer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilter.cs   | 3 ++-
 .../Analysis/Ga/IrishLowerCaseFilterFactory.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs       | 3 ++-
 .../Analysis/Gl/GalicianMinimalStemFilter.cs                         | 3 ++-
 .../Analysis/Gl/GalicianMinimalStemFilterFactory.cs                  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemmer.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilter.cs     | 3 ++-
 .../Analysis/Gl/GalicianStemFilterFactory.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemmer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs          | 3 ++-
 .../Analysis/Hi/HindiNormalizationFilter.cs                          | 3 ++-
 .../Analysis/Hi/HindiNormalizationFilterFactory.cs                   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilter.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilterFactory.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemmer.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs      | 3 ++-
 .../Analysis/Hu/HungarianLightStemFilter.cs                          | 3 ++-
 .../Analysis/Hu/HungarianLightStemFilterFactory.cs                   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemmer.cs  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs       | 3 ++-
 .../Analysis/Hunspell/HunspellStemFilter.cs                          | 3 ++-
 .../Analysis/Hunspell/HunspellStemFilterFactory.cs                   | 3 ++-
 .../Analysis/Hunspell/ISO8859_14Decoder.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilter.cs   | 3 ++-
 .../Analysis/Id/IndonesianStemFilterFactory.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemmer.cs      | 3 ++-
 .../Analysis/In/IndicNormalizationFilter.cs                          | 3 ++-
 .../Analysis/In/IndicNormalizationFilterFactory.cs                   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/In/IndicTokenizer.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilter.cs | 3 ++-
 .../Analysis/It/ItalianLightStemFilterFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemmer.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilter.cs      | 3 ++-
 .../Analysis/Lv/LatvianStemFilterFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemmer.cs         | 3 ++-
 .../Analysis/Miscellaneous/ASCIIFoldingFilter.cs                     | 3 ++-
 .../Analysis/Miscellaneous/ASCIIFoldingFilterFactory.cs              | 3 ++-
 .../Analysis/Miscellaneous/CapitalizationFilter.cs                   | 3 ++-
 .../Analysis/Miscellaneous/CapitalizationFilterFactory.cs            | 3 ++-
 .../Analysis/Miscellaneous/CodepointCountFilter.cs                   | 3 ++-
 .../Analysis/Miscellaneous/CodepointCountFilterFactory.cs            | 3 ++-
 .../Analysis/Miscellaneous/EmptyTokenStream.cs                       | 3 ++-
 .../Analysis/Miscellaneous/HyphenatedWordsFilter.cs                  | 3 ++-
 .../Analysis/Miscellaneous/HyphenatedWordsFilterFactory.cs           | 3 ++-
 .../Analysis/Miscellaneous/KeepWordFilter.cs                         | 3 ++-
 .../Analysis/Miscellaneous/KeepWordFilterFactory.cs                  | 3 ++-
 .../Analysis/Miscellaneous/KeywordMarkerFilter.cs                    | 3 ++-
 .../Analysis/Miscellaneous/KeywordMarkerFilterFactory.cs             | 3 ++-
 .../Analysis/Miscellaneous/KeywordRepeatFilter.cs                    | 3 ++-
 .../Analysis/Miscellaneous/KeywordRepeatFilterFactory.cs             | 3 ++-
 .../Analysis/Miscellaneous/LengthFilter.cs                           | 3 ++-
 .../Analysis/Miscellaneous/LengthFilterFactory.cs                    | 3 ++-
 .../Analysis/Miscellaneous/LimitTokenCountAnalyzer.cs                | 3 ++-
 .../Analysis/Miscellaneous/LimitTokenCountFilter.cs                  | 3 ++-
 .../Analysis/Miscellaneous/LimitTokenCountFilterFactory.cs           | 3 ++-
 .../Analysis/Miscellaneous/LimitTokenPositionFilter.cs               | 3 ++-
 .../Analysis/Miscellaneous/LimitTokenPositionFilterFactory.cs        | 3 ++-
 .../Analysis/Miscellaneous/Lucene47WordDelimiterFilter.cs            | 3 ++-
 .../Analysis/Miscellaneous/PatternAnalyzer.cs                        | 3 ++-
 .../Analysis/Miscellaneous/PatternKeywordMarkerFilter.cs             | 3 ++-
 .../Analysis/Miscellaneous/PerFieldAnalyzerWrapper.cs                | 3 ++-
 .../Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs        | 3 ++-
 .../Analysis/Miscellaneous/PrefixAwareTokenFilter.cs                 | 3 ++-
 .../Analysis/Miscellaneous/RemoveDuplicatesTokenFilter.cs            | 3 ++-
 .../Analysis/Miscellaneous/RemoveDuplicatesTokenFilterFactory.cs     | 3 ++-
 .../Analysis/Miscellaneous/ScandinavianFoldingFilter.cs              | 3 ++-
 .../Analysis/Miscellaneous/ScandinavianFoldingFilterFactory.cs       | 3 ++-
 .../Analysis/Miscellaneous/ScandinavianNormalizationFilter.cs        | 3 ++-
 .../Analysis/Miscellaneous/ScandinavianNormalizationFilterFactory.cs | 3 ++-
 .../Analysis/Miscellaneous/SetKeywordMarkerFilter.cs                 | 3 ++-
 .../Analysis/Miscellaneous/SingleTokenTokenStream.cs                 | 3 ++-
 .../Analysis/Miscellaneous/StemmerOverrideFilter.cs                  | 3 ++-
 .../Analysis/Miscellaneous/StemmerOverrideFilterFactory.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilter.cs  | 3 ++-
 .../Analysis/Miscellaneous/TrimFilterFactory.cs                      | 3 ++-
 .../Analysis/Miscellaneous/TruncateTokenFilter.cs                    | 3 ++-
 .../Analysis/Miscellaneous/TruncateTokenFilterFactory.cs             | 3 ++-
 .../Analysis/Miscellaneous/WordDelimiterFilter.cs                    | 3 ++-
 .../Analysis/Miscellaneous/WordDelimiterFilterFactory.cs             | 3 ++-
 .../Analysis/Miscellaneous/WordDelimiterIterator.cs                  | 3 ++-
 .../Analysis/NGram/EdgeNGramFilterFactory.cs                         | 3 ++-
 .../Analysis/NGram/EdgeNGramTokenFilter.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizer.cs  | 3 ++-
 .../Analysis/NGram/EdgeNGramTokenizerFactory.cs                      | 3 ++-
 .../Analysis/NGram/Lucene43EdgeNGramTokenizer.cs                     | 3 ++-
 .../Analysis/NGram/Lucene43NGramTokenizer.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramFilterFactory.cs  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenFilter.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizer.cs      | 3 ++-
 .../Analysis/NGram/NGramTokenizerFactory.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemFilter.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemmer.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs      | 3 ++-
 .../Analysis/No/NorwegianLightStemFilter.cs                          | 3 ++-
 .../Analysis/No/NorwegianLightStemFilterFactory.cs                   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs  | 3 ++-
 .../Analysis/No/NorwegianMinimalStemFilter.cs                        | 3 ++-
 .../Analysis/No/NorwegianMinimalStemFilterFactory.cs                 | 3 ++-
 .../Analysis/No/NorwegianMinimalStemmer.cs                           | 3 ++-
 .../Analysis/Path/PathHierarchyTokenizer.cs                          | 3 ++-
 .../Analysis/Path/PathHierarchyTokenizerFactory.cs                   | 3 ++-
 .../Analysis/Path/ReversePathHierarchyTokenizer.cs                   | 3 ++-
 .../Analysis/Pattern/PatternCaptureGroupFilterFactory.cs             | 3 ++-
 .../Analysis/Pattern/PatternCaptureGroupTokenFilter.cs               | 3 ++-
 .../Analysis/Pattern/PatternReplaceCharFilter.cs                     | 3 ++-
 .../Analysis/Pattern/PatternReplaceCharFilterFactory.cs              | 3 ++-
 .../Analysis/Pattern/PatternReplaceFilter.cs                         | 3 ++-
 .../Analysis/Pattern/PatternReplaceFilterFactory.cs                  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizer.cs  | 3 ++-
 .../Analysis/Pattern/PatternTokenizerFactory.cs                      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs  | 3 ++-
 .../Analysis/Payloads/DelimitedPayloadTokenFilter.cs                 | 3 ++-
 .../Analysis/Payloads/DelimitedPayloadTokenFilterFactory.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Payloads/FloatEncoder.cs     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Payloads/IdentityEncoder.cs  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Payloads/IntegerEncoder.cs   | 3 ++-
 .../Analysis/Payloads/NumericPayloadTokenFilter.cs                   | 3 ++-
 .../Analysis/Payloads/NumericPayloadTokenFilterFactory.cs            | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadHelper.cs    | 3 ++-
 .../Analysis/Payloads/TokenOffsetPayloadTokenFilter.cs               | 3 ++-
 .../Analysis/Payloads/TokenOffsetPayloadTokenFilterFactory.cs        | 3 ++-
 .../Analysis/Payloads/TypeAsPayloadTokenFilter.cs                    | 3 ++-
 .../Analysis/Payloads/TypeAsPayloadTokenFilterFactory.cs             | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilter.cs   | 3 ++-
 .../Analysis/Position/PositionFilterFactory.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs     | 3 ++-
 .../Analysis/Pt/PortugueseLightStemFilter.cs                         | 3 ++-
 .../Analysis/Pt/PortugueseLightStemFilterFactory.cs                  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemmer.cs | 3 ++-
 .../Analysis/Pt/PortugueseMinimalStemFilter.cs                       | 3 ++-
 .../Analysis/Pt/PortugueseMinimalStemFilterFactory.cs                | 3 ++-
 .../Analysis/Pt/PortugueseMinimalStemmer.cs                          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilter.cs   | 3 ++-
 .../Analysis/Pt/PortugueseStemFilterFactory.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemmer.cs      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Pt/RSLPStemmerBase.cs        | 3 ++-
 .../Analysis/Query/QueryAutoStopWordAnalyzer.cs                      | 3 ++-
 .../Analysis/Reverse/ReverseStringFilter.cs                          | 3 ++-
 .../Analysis/Reverse/ReverseStringFilterFactory.cs                   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizer.cs | 3 ++-
 .../Analysis/Ru/RussianLetterTokenizerFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilter.cs | 3 ++-
 .../Analysis/Ru/RussianLightStemFilterFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemmer.cs    | 3 ++-
 .../Analysis/Shingle/ShingleAnalyzerWrapper.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilter.cs     | 3 ++-
 .../Analysis/Shingle/ShingleFilterFactory.cs                         | 3 ++-
 .../Analysis/Sinks/DateRecognizerSinkFilter.cs                       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Sinks/TeeSinkTokenFilter.cs  | 3 ++-
 .../Analysis/Sinks/TokenRangeSinkFilter.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenTypeSinkFilter.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs   | 3 ++-
 .../Analysis/Snowball/SnowballPorterFilterFactory.cs                 | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilter.cs    | 3 ++-
 .../Analysis/Standard/ClassicFilterFactory.cs                        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs | 3 ++-
 .../Analysis/Standard/ClassicTokenizerFactory.cs                     | 3 ++-
 .../Analysis/Standard/ClassicTokenizerImpl.cs                        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilter.cs   | 3 ++-
 .../Analysis/Standard/StandardFilterFactory.cs                       | 3 ++-
 .../Analysis/Standard/StandardTokenizer.cs                           | 3 ++-
 .../Analysis/Standard/StandardTokenizerFactory.cs                    | 3 ++-
 .../Analysis/Standard/StandardTokenizerImpl.cs                       | 3 ++-
 .../Analysis/Standard/StandardTokenizerInterface.cs                  | 3 ++-
 .../Analysis/Standard/Std31/StandardTokenizerImpl31.cs               | 5 +++--
 .../Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs          | 3 ++-
 .../Analysis/Standard/Std34/StandardTokenizerImpl34.cs               | 5 +++--
 .../Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs          | 3 ++-
 .../Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs          | 3 ++-
 .../Analysis/Standard/Std40/StandardTokenizerImpl40.cs               | 5 +++--
 .../Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs          | 3 ++-
 .../Analysis/Standard/UAX29URLEmailAnalyzer.cs                       | 3 ++-
 .../Analysis/Standard/UAX29URLEmailTokenizer.cs                      | 3 ++-
 .../Analysis/Standard/UAX29URLEmailTokenizerFactory.cs               | 3 ++-
 .../Analysis/Standard/UAX29URLEmailTokenizerImpl.cs                  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilter.cs | 3 ++-
 .../Analysis/Sv/SwedishLightStemFilterFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemmer.cs    | 3 ++-
 .../Analysis/Synonym/FSTSynonymFilterFactory.cs                      | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilter.cs | 3 ++-
 .../Analysis/Synonym/SlowSynonymFilterFactory.cs                     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymMap.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs     | 3 ++-
 .../Analysis/Synonym/SynonymFilterFactory.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs        | 3 ++-
 .../Analysis/Synonym/WordnetSynonymParser.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizerFactory.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilterFactory.cs  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilter.cs       | 3 ++-
 .../Analysis/Tr/ApostropheFilterFactory.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilter.cs | 3 ++-
 .../Analysis/Tr/TurkishLowerCaseFilterFactory.cs                     | 3 ++-
 .../Analysis/Util/AbstractAnalysisFactory.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/AnalysisSPILoader.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayIterator.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/CharFilterFactory.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs       | 3 ++-
 .../Analysis/Util/ClasspathResourceLoader.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilter.cs        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilterFactory.cs | 3 ++-
 .../Analysis/Util/FilesystemResourceLoader.cs                        | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/FilteringTokenFilter.cs | 3 ++-
 .../Analysis/Util/MultiTermAwareComponent.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/OpenStringBuilder.cs    | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs       | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoaderAware.cs  | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/RollingCharBuffer.cs    | 3 ++-
 .../Analysis/Util/SegmentingTokenizerBase.cs                         | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/StemmerUtil.cs          | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/TokenFilterFactory.cs   | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/TokenizerFactory.cs     | 3 ++-
 src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs       | 3 ++-
 .../Analysis/Wikipedia/WikipediaTokenizer.cs                         | 3 ++-
 .../Analysis/Wikipedia/WikipediaTokenizerFactory.cs                  | 3 ++-
 .../Analysis/Wikipedia/WikipediaTokenizerImpl.cs                     | 5 +++--
 .../Collation/CollationAttributeFactory.cs                           | 3 ++-
 src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs     | 3 ++-
 src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs       | 3 ++-
 .../Collation/CollationKeyFilterFactory.cs                           | 3 ++-
 .../Collation/TokenAttributes/CollatedTermAttributeImpl.cs           | 3 ++-
 src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Among.cs            | 5 +++--
 .../Tartarus/Snowball/Ext/ArmenianStemmer.cs                         | 5 +++--
 .../Tartarus/Snowball/Ext/BasqueStemmer.cs                           | 5 +++--
 .../Tartarus/Snowball/Ext/CatalanStemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/DanishStemmer.cs                           | 5 +++--
 src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DutchStemmer.cs | 5 +++--
 .../Tartarus/Snowball/Ext/EnglishStemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/FinnishStemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/FrenchStemmer.cs                           | 5 +++--
 .../Tartarus/Snowball/Ext/German2Stemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/GermanStemmer.cs                           | 5 +++--
 .../Tartarus/Snowball/Ext/HungarianStemmer.cs                        | 5 +++--
 src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/IrishStemmer.cs | 5 +++--
 .../Tartarus/Snowball/Ext/ItalianStemmer.cs                          | 5 +++--
 src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/KpStemmer.cs    | 5 +++--
 .../Tartarus/Snowball/Ext/LovinsStemmer.cs                           | 5 +++--
 .../Tartarus/Snowball/Ext/NorwegianStemmer.cs                        | 5 +++--
 .../Tartarus/Snowball/Ext/PorterStemmer.cs                           | 5 +++--
 .../Tartarus/Snowball/Ext/PortugueseStemmer.cs                       | 5 +++--
 .../Tartarus/Snowball/Ext/RomanianStemmer.cs                         | 5 +++--
 .../Tartarus/Snowball/Ext/RussianStemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/SpanishStemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/SwedishStemmer.cs                          | 5 +++--
 .../Tartarus/Snowball/Ext/TurkishStemmer.cs                          | 5 +++--
 src/Lucene.Net.Analysis.Common/Tartarus/Snowball/SnowballProgram.cs  | 5 +++--
 418 files changed, 866 insertions(+), 448 deletions(-)

diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs
index c071c67..29dba10 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizer.cs
index fa5bfa1..c1119c8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizerFactory.cs
index cd5c835..be87e37 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicLetterTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilter.cs
index 4305129..c774f52 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Ar
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilterFactory.cs
index ec2f331..f4941de 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizer.cs
index a0656b0..930c67e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Ar
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilter.cs
index 2cb9070..1684f8f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Ar
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilterFactory.cs
index 28013b8..a9efa07 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemmer.cs
index 98edfed..17481ec 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ar/ArabicStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Analysis.Ar
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs
index 6ef9387..58541c9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilter.cs
index aaa05e6..4bc2703 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Bg
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilterFactory.cs
index c2bc098..38b6889 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemmer.cs
index 1e53ebd..42048cb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Bg/BulgarianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Bg
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs
index 743a547..b6048b8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilter.cs
index 7d6ec70..8387e87 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 
 namespace Lucene.Net.Analysis.Br
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilterFactory.cs
index 2306f83..9c41081 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemmer.cs
index 8e34cc1..d74dffd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Br/BrazilianStemmer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Globalization;
 
 namespace Lucene.Net.Analysis.Br
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs
index 6ba1aa7..92457bf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ca/CatalanAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs
index 46fa322..a14563d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/BaseCharFilter.cs
@@ -1,4 +1,5 @@
-using J2N.Numerics;
+// Lucene version compatibility level 4.8.1
+using J2N.Numerics;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
index 98f7eb7..e2c3778 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
@@ -32057,4 +32058,4 @@ namespace Lucene.Net.Analysis.CharFilters
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilterFactory.cs
index 74dc924..50238bf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/HTMLStripCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilter.cs
index dec5db1..9f8760f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Fst;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilterFactory.cs
index 8cec3e4..37e549c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/MappingCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/NormalizeCharMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/NormalizeCharMap.cs
index e3963d2..7620252 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/NormalizeCharMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CharFilter/NormalizeCharMap.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Fst;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs
index 5b23b8c..6af3a54 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilter.cs
index e16022b..58dad0e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilterFactory.cs
index 5938e41..3f06cb4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKBigramFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizer.cs
index 5cf5632..03f68f1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizerFactory.cs
index 2ef8524..fa265fa 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilter.cs
index cf602f6..739c30b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Cjk
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilterFactory.cs
index ce12836..fc31948 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cjk/CJKWidthFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs
index 41701aa..9823080 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilter.cs
index ef95965..189b600 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Ckb
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilterFactory.cs
index 0b86fc4..391b1cc 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizer.cs
index b9b8ef0..331fc49 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System.Globalization;
 
 namespace Lucene.Net.Analysis.Ckb
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilter.cs
index 9387fcd..19c36f7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Ckb
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilterFactory.cs
index f202647..3284022 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemmer.cs
index 5c768f8..c9c225f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ckb/SoraniStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Ckb
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs
index 69d8a12..6eba362 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseAnalyzer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Cn
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilter.cs
index d7a7780..36d0a76 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilterFactory.cs
index 17eee9a..a8785ab 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizer.cs
index 5447e0c..b36c104 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.Globalization;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizerFactory.cs
index f2c8f77..4c36fc0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cn/ChineseTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilter.cs
index 941e369..ca7b3b1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilterFactory.cs
index 9720142..560b3a8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilter.cs
index 312aa6f..f311fba 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 
 namespace Lucene.Net.Analysis.CommonGrams
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilterFactory.cs
index 1e067e9..68e3c2b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/CommonGrams/CommonGramsQueryFilterFactory.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+// Lucene version compatibility level 4.8.1
+using System.Collections.Generic;
 
 namespace Lucene.Net.Analysis.CommonGrams
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/CompoundWordTokenFilterBase.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/CompoundWordTokenFilterBase.cs
index bf5ecab..50819c4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/CompoundWordTokenFilterBase.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/CompoundWordTokenFilterBase.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilter.cs
index 0cc0505..37d8f82 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilterFactory.cs
index da1150d..9ce559c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/DictionaryCompoundWordTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
index db7dfce..82cbf68 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/ByteVector.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Lucene.Net.Analysis.Compound.Hyphenation
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/CharVector.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/CharVector.cs
index b3411c2..30c7172 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/CharVector.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/CharVector.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using System;
 using System.Diagnostics.CodeAnalysis;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphen.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphen.cs
index 8fc13cf..9cd46c6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphen.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphen.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Text;
 
 namespace Lucene.Net.Analysis.Compound.Hyphenation
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphenation.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphenation.cs
index 2c9f966..f5e4ac8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphenation.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/Hyphenation.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using System.Diagnostics.CodeAnalysis;
 
 namespace Lucene.Net.Analysis.Compound.Hyphenation
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
index f9373a7..e59acb5 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
@@ -1,4 +1,5 @@
-using J2N.Numerics;
+// Lucene version compatibility level 4.8.1
+using J2N.Numerics;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternConsumer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternConsumer.cs
index 1d92db5..98e715b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternConsumer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternConsumer.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+// Lucene version compatibility level 4.8.1
+using System.Collections.Generic;
 
 namespace Lucene.Net.Analysis.Compound.Hyphenation
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
index 6e73b19..0ed4a58 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/TernaryTree.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/TernaryTree.cs
index 1dfeb92..7dd428a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/TernaryTree.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/TernaryTree.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilter.cs
index e7a7726..daef17a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Compound.Hyphenation;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Compound.Hyphenation;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
index 116538a..d8cb93c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Compound/HyphenationCompoundWordTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Compound.Hyphenation;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Compound.Hyphenation;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
index 7dc0d97..587fde1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordAnalyzer.cs
@@ -1,4 +1,5 @@
-using System.IO;
+// Lucene version compatibility level 4.8.1
+using System.IO;
 
 namespace Lucene.Net.Analysis.Core
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizer.cs
index ce37bd1..896c25c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizerFactory.cs
index 36cc7c8..e32ab5d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/KeywordTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizer.cs
index 29d5c4a..2ce5b6d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizerFactory.cs
index 0f384e1..9f23989 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/LetterTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilter.cs
index 5f9ee42..44715be 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilterFactory.cs
index d51add8..7341a36 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizer.cs
index 4ea4db6..cafe7af 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Util;
 using System.Globalization;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizerFactory.cs
index 68b83b8..d670c21 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/LowerCaseTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs
index 3c0ac9a..f6a46d0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/SimpleAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Core
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs
index f06d3f4..94e1752 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilter.cs
index e8ae3b7..ea4da35 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilterFactory.cs
index 51361bc..b348a94 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/StopFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilter.cs
index 0c993ad..3bcdc75 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilterFactory.cs
index 8abe89a..a030030 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/TypeTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using JCG = J2N.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilter.cs
index f598858..c57ac5b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilterFactory.cs
index 78ea8dd..bad5bd0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/UpperCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs
index e49fc57..8350bd8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceAnalyzer.cs
@@ -1,4 +1,5 @@
-using System.IO;
+// Lucene version compatibility level 4.8.1
+using System.IO;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizer.cs
index b6bb740..d4a78b6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizerFactory.cs
index 8e0815a..0f17d9b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Core/WhitespaceTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using System.IO;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs
index 15275f7..29307f9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilter.cs
index 58720e4..055c834 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Cz
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilterFactory.cs
index 30cac93..f9f20c6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemmer.cs
index f58dd96..0f1c590 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Cz/CzechStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Cz
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs
index 200d416..4a2f217 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Da/DanishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs
index af58c58..86a8fa3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilter.cs
index 3fad252..39324e3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.De
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilterFactory.cs
index 1eb6162..c5d8711 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemmer.cs
index ac3ee11..305e079 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanLightStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.De
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.De
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilter.cs
index b26ed3c..084a527 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.De
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilterFactory.cs
index cae7f58..e4b9154 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemmer.cs
index 3affba7..4045c2c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanMinimalStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.De
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.De
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilter.cs
index f3cde95..6235342 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilterFactory.cs
index ae43bde..6e91424 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilter.cs
index b4dd8cd..ad96338 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 
 namespace Lucene.Net.Analysis.De
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilterFactory.cs
index 1be9a0f..7c32d98 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemmer.cs
index 2a2c9b8..d7a842e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/De/GermanStemmer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Globalization;
 using System.Text;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs
index 222ed73..2ceab4e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilter.cs
index 40a0d6d..c16a250 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilterFactory.cs
index cfe8612..0d6a313 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekLowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilter.cs
index ecc4d99..fbc1155 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.El
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilterFactory.cs
index 2c551c7..bec200b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemmer.cs
index e45a672..9724b7f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/El/GreekStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.El
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs
index 4edc410..c77770d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilter.cs
index c605a7b..40b0067 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.En
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilterFactory.cs
index 00a1bef..9757ca7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemmer.cs
index 5a7a66f..40a9d39 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishMinimalStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.En
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.En
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilter.cs
index 844e52c..e9849b7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilter.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using Lucene.Net.Util;
 using Lucene.Net.Analysis.TokenAttributes;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilterFactory.cs
index a9db7c9..8a71227 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/EnglishPossessiveFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData1.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData1.cs
index ee22dc7..2c38fc2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData1.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData1.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData2.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData2.cs
index 98b94cd..5df4284 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData2.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData2.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData3.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData3.cs
index 9a2d0ee..4980fcb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData3.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData3.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData4.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData4.cs
index e6eeee4..4752a68 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData4.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData4.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData5.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData5.cs
index 0c99140..0a09e77 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData5.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData5.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData6.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData6.cs
index 35d7d8c..afb064a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData6.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData6.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData7.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData7.cs
index c3e6740..1c0f004 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData7.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData7.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData8.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData8.cs
index 96317e7..ef49190 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData8.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemData8.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 Copyright © 2003,
 Center for Intelligent Information Retrieval,
 University of Massachusetts, Amherst.
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilter.cs
index 7170273..1c74ed3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System.IO;
 
 namespace Lucene.Net.Analysis.En
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilterFactory.cs
index 1aeba71..47f5ace 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System.Collections.Generic;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemmer.cs
index 45f4a60..96d92b4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/KStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/KStemmer.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilter.cs
index f85acad..c962bc4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.En
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilterFactory.cs
index a50bc23..b6d0930 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemmer.cs
index 7d81a3c..2d1b511 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/En/PorterStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
 using System.Diagnostics.CodeAnalysis;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs
index e2424f0..b7b51d3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilter.cs
index ce8b528..43e3700 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Es
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilterFactory.cs
index 8f9daa3..1acf13b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemmer.cs
index 64c0310..2dd1903 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Es/SpanishLightStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Es
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Es
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs
index fc54824..88fcc3e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Eu/BasqueAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs
index 30563cd..c225756 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Ar;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Ar;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilter.cs
index acbe743..7e50c61 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilter.cs
@@ -1,4 +1,5 @@
-using System.IO;
+// Lucene version compatibility level 4.8.1
+using System.IO;
 
 namespace Lucene.Net.Analysis.Fa
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilterFactory.cs
index d4d58fb..f57c487 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilter.cs
index 3a87977..cb3937f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Fa
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilterFactory.cs
index d427ea5..10a2df1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizer.cs
index 4823af2..1790a67 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fa/PersianNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Fa
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs
index 43a8951..2026df2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilter.cs
index cc2549d..f5924e9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Fi
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilterFactory.cs
index 5aa3237..cd2e390 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemmer.cs
index f41a0d8..3ee19c8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fi/FinnishLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Fi
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs
index 0f1f46e..b17e898 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilter.cs
index 603cdc7..de1b368 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Fr
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilterFactory.cs
index 512771d..ee75885 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemmer.cs
index e6d8322..099d111 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Fr
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilter.cs
index 977e438..c5e0bc4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Fr
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilterFactory.cs
index 36abdb8..38df7d9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemmer.cs
index a2f6382..3d0755c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchMinimalStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Fr
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Fr
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemFilter.cs
index 03866cb..57c571f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 
 namespace Lucene.Net.Analysis.Fr
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemmer.cs
index 7fcb47b..1dcae79 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Fr/FrenchStemmer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Globalization;
 using System.Text;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs
index 810c05a..5b0c617 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilter.cs
index 7299804..5696a52 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using System.Globalization;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilterFactory.cs
index a62eb1f..2c5ca45 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ga/IrishLowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs
index 5d9a19e..eff4403 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilter.cs
index e57887c..9a60933 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Gl
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilterFactory.cs
index 785c397..77adee8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemmer.cs
index 7631e29..754d8f2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianMinimalStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Pt;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Pt;
 
 namespace Lucene.Net.Analysis.Gl
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilter.cs
index bbefa48..0e546d2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Gl
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilterFactory.cs
index c4057f4..85b60fa 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemmer.cs
index e50e048..a939c23 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Gl/GalicianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Pt;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Pt;
 using Lucene.Net.Diagnostics;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs
index d125ecd..62bc54e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.In;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilter.cs
index d63039a..579abd7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Hi
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilterFactory.cs
index 09ddfec..37d3663 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizer.cs
index 5a1a596..0387d83 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Hi
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilter.cs
index 3d58140..01db8e3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Hi
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilterFactory.cs
index 9da1681..167ea88 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemmer.cs
index b00f82b..01a3dcf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hi/HindiStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Hi
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs
index 8e3bd20..b7f69a9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilter.cs
index 38cf806..44f4763 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Hu
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilterFactory.cs
index 2dceca6..4ce1ccd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemmer.cs
index efee199..ca1e84f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hu/HungarianLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Hu
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
index 6804308..38d19f5 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Dictionary.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Collections.Generic.Extensions;
 using J2N.Numerics;
 using J2N.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs
index 0547f0d..d4526d6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
index 7d9b4d3..f5c044b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/HunspellStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs
index 870366b..a406b68 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/ISO8859_14Decoder.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using System;
 using System.Text;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs
index 6cdd491..ee0cb6b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hunspell/Stemmer.cs
@@ -1,4 +1,5 @@
-using J2N.Numerics;
+// Lucene version compatibility level 4.8.1
+using J2N.Numerics;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Store;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs
index c55aa0d..f37d6f3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Hy/ArmenianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs
index eae7733..e6c8e2c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilter.cs
index c87d191..5a2af93 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Id
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilterFactory.cs
index 16b97f3..db2fc98 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System.Collections.Generic;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemmer.cs
index 8585868..744f6c1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Id/IndonesianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Id
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilter.cs
index aaf0050..a3d7c9f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.In
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilterFactory.cs
index e98ac37..8c65146 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizer.cs
index 3aeb5bb..ac897cc 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicNormalizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicTokenizer.cs
index ac817ad..5f4b073 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/In/IndicTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/In/IndicTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs
index 7b1ade2..8a05769 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilter.cs
index ffad3e7..4e1b242 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.It
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilterFactory.cs
index d251dff..906ba32 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemmer.cs
index 33e0c3c..086c53d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/It/ItalianLightStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.It
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.It
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs
index f29ea13..23827a4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilter.cs
index 8d99e6d..a771e51 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Lv
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilterFactory.cs
index 9408efb..497a821 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemmer.cs
index 14eca02..b4df86d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Lv/LatvianStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Lv
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilter.cs
index 70095ee..d572f16 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilterFactory.cs
index 7ae8788..4d78468 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ASCIIFoldingFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilter.cs
index 48228fa..8cf86d8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilter.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilterFactory.cs
index 990b4ab..be98da5 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CapitalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilter.cs
index 8f0e73f..3de1095 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilterFactory.cs
index 7246c6c..950f8b9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/CodepointCountFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/EmptyTokenStream.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/EmptyTokenStream.cs
index 53867ed..e627d44 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/EmptyTokenStream.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/EmptyTokenStream.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Miscellaneous
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Miscellaneous
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilter.cs
index 156ae10..ea95b05 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.Text;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilterFactory.cs
index 8368e60..ce7d116 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/HyphenatedWordsFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilter.cs
index a7972e0..73d766f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilterFactory.cs
index 1145e96..735cfb2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeepWordFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilter.cs
index b5a8117..ccf761b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilterFactory.cs
index f99a1e9..3d9f025 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordMarkerFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilter.cs
index 13aa99b..f027114 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilterFactory.cs
index 6e8a4e1..4abc64a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/KeywordRepeatFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using Lucene.Net.Analysis.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilter.cs
index 32f9fa9..dacc5ea 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilterFactory.cs
index c44abaa..df82678 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LengthFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountAnalyzer.cs
index 51361b2..b937a7f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountAnalyzer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Miscellaneous
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Miscellaneous
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilter.cs
index 5932ce7..573e730 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilter.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 
 namespace Lucene.Net.Analysis.Miscellaneous
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilterFactory.cs
index 8eeb80b..6acd1f9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenCountFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilter.cs
index ce4a160..0f6ade1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilterFactory.cs
index 396add1..48d40f8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/LimitTokenPositionFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/Lucene47WordDelimiterFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/Lucene47WordDelimiterFilter.cs
index 3a62bdc..0511abd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/Lucene47WordDelimiterFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/Lucene47WordDelimiterFilter.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Text;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
index 12b7166..471e546 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternKeywordMarkerFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternKeywordMarkerFilter.cs
index a9166dd..4d74f90 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternKeywordMarkerFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PatternKeywordMarkerFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System.Text.RegularExpressions;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PerFieldAnalyzerWrapper.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PerFieldAnalyzerWrapper.cs
index c1ccb8d..4ddefa0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PerFieldAnalyzerWrapper.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PerFieldAnalyzerWrapper.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Support;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Support;
 using System.Collections.Generic;
 using JCG = J2N.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
index 65f3808..cc85abe 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAndSuffixAwareTokenFilter.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Miscellaneous
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Miscellaneous
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
index c56938e..3dd93bb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/PrefixAwareTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilter.cs
index d93b7a8..37dc039 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilterFactory.cs
index 46e2a12..7f88599 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/RemoveDuplicatesTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilter.cs
index 9f8adbc..e9c34df 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilterFactory.cs
index 2476761..023f6f7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianFoldingFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilter.cs
index 085c355..8383eb4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilterFactory.cs
index 90147a6..9cb9bf0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/ScandinavianNormalizationFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SetKeywordMarkerFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SetKeywordMarkerFilter.cs
index ee13614..b30fa48 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SetKeywordMarkerFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SetKeywordMarkerFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SingleTokenTokenStream.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SingleTokenTokenStream.cs
index 3e384bd..5e6802f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SingleTokenTokenStream.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/SingleTokenTokenStream.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
 using System.Diagnostics;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilter.cs
index bc81134..d2111b9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Fst;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilterFactory.cs
index b516622..6ce1ae6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/StemmerOverrideFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilter.cs
index c89c8f9..ee0dfdf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilter.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilterFactory.cs
index dd57e00..3fa15a4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TrimFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilter.cs
index b618318..dde5a53 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilterFactory.cs
index 42d62e8..cbbef7a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/TruncateTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.Globalization;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilter.cs
index 0a5ced8..def5021 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilterFactory.cs
index 1588a1e..eb4b691 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterIterator.cs b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterIterator.cs
index be656ee..f6dfbfd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterIterator.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Miscellaneous/WordDelimiterIterator.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using System.Globalization;
 
 namespace Lucene.Net.Analysis.Miscellaneous
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramFilterFactory.cs
index bf991fe..2c301ef 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilter.cs
index 13789bf..7ccff41 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizer.cs
index 7ecb1e5..dad44e0 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System.IO;
 
 namespace Lucene.Net.Analysis.NGram
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerFactory.cs
index c8941c6..d3c3fef 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/EdgeNGramTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43EdgeNGramTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43EdgeNGramTokenizer.cs
index 61b0ada..b1bdacd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43EdgeNGramTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43EdgeNGramTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43NGramTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43NGramTokenizer.cs
index fc91fa1..ae31bd3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43NGramTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/Lucene43NGramTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramFilterFactory.cs
index f4197d5..674c489 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenFilter.cs
index 0c5deef..b1b76cb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Miscellaneous;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizer.cs
index d03c06d..c3f1deb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizerFactory.cs
index 118a909..05bea60 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/NGram/NGramTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
index 19867e4..ad02830 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemFilter.cs
index 5a7ccca..3b567a7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemmer.cs
index 06ff38b..108858e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Nl/DutchStemmer.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs
index 3cdb3f8..9019734 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs
index d8fd1b1..8595fc3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.No
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs
index 0c6782b..3f903d1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs
index a57b68a..19fa3c3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 
 namespace Lucene.Net.Analysis.No
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs
index 85dcdb5..a85f8eb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.No
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs
index 2abfce7..47959e7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs
index 312c210..40b94fd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/No/NorwegianMinimalStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 
 namespace Lucene.Net.Analysis.No
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizer.cs
index 8ae3da8..c45cba8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 using System.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizerFactory.cs
index 6f1301a..e845f89 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Path/PathHierarchyTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Path/ReversePathHierarchyTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Path/ReversePathHierarchyTokenizer.cs
index adf013b..2600949 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Path/ReversePathHierarchyTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Path/ReversePathHierarchyTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupFilterFactory.cs
index 8f16257..d12b682 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupTokenFilter.cs
index 1b6f976..4a08951 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternCaptureGroupTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using System.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilter.cs
index c2d907b..f415e47 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.CharFilters;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.CharFilters;
 using System;
 using System.IO;
 using System.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilterFactory.cs
index e6ada46..cdb38eb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceCharFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System.Collections.Generic;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilter.cs
index aa687b3..5327dbc 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System.Text.RegularExpressions;
 
 namespace Lucene.Net.Analysis.Pattern
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilterFactory.cs
index a6b421f..fc1feb6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternReplaceFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizer.cs
index d20a4ad..1f95a70 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 using System.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizerFactory.cs
index 63faf0a..ed86a28 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pattern/PatternTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.Collections.Generic;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
index 888366f..8903c5d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/AbstractEncoder.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Payloads
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilter.cs
index 225c026..1743c2a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Payloads
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterFactory.cs
index 7d32ad7..2f6458b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/DelimitedPayloadTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using Lucene.Net.Analysis.Util;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/FloatEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/FloatEncoder.cs
index 836fe1f..525fc3b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/FloatEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/FloatEncoder.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System.Globalization;
 
 namespace Lucene.Net.Analysis.Payloads
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IdentityEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IdentityEncoder.cs
index d05e1a9..a7999bb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IdentityEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IdentityEncoder.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System.Text;
 
 namespace Lucene.Net.Analysis.Payloads
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IntegerEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IntegerEncoder.cs
index 526c3ec..3f18cb1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IntegerEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/IntegerEncoder.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Payloads
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilter.cs
index 89833d5..1e0bd3d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterFactory.cs
index 90f9d60..44c08c1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/NumericPayloadTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
index 3f0a8a7..1182558 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadEncoder.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Payloads
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadHelper.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadHelper.cs
index 32c76d4..8dbfb5e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadHelper.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/PayloadHelper.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Payloads
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Payloads
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilter.cs
index f181e1f..c0f8d2b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Payloads
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterFactory.cs
index 75e5501..83456e3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TokenOffsetPayloadTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilter.cs
index ceb6526..de3eb37 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Payloads
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterFactory.cs
index 4cdc6dc..e2b2274 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Payloads/TypeAsPayloadTokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilter.cs
index 29a3ef9..e389116 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilter.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Position
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilterFactory.cs
index 8dc83bf..3ecc003 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Position/PositionFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs
index 25491ea..cde1ec8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilter.cs
index 01bcdc9..22fb18b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Pt
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilterFactory.cs
index a838b3d..51dd54b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemmer.cs
index 64b7681..c37e40b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Pt
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilter.cs
index 0a329cc..f3fce75 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Pt
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilterFactory.cs
index 27c41f2..c3976bf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemmer.cs
index 5ebf93d..86b0533 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseMinimalStemmer.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Pt
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Pt
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilter.cs
index b1db952..932f82c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Pt
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilterFactory.cs
index 6079c64..ccf2a75 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemmer.cs
index 0bfee1e..7c240c7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/PortugueseStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Analysis.Pt
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Pt/RSLPStemmerBase.cs b/src/Lucene.Net.Analysis.Common/Analysis/Pt/RSLPStemmerBase.cs
index 108a87a..8d6f5bb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Pt/RSLPStemmerBase.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Pt/RSLPStemmerBase.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using J2N.Text;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
index 3b3ce72..4e7319c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Query/QueryAutoStopWordAnalyzer.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Index;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilter.cs
index 4440167..231a34a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilterFactory.cs
index e21da33..335125f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Reverse/ReverseStringFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs
index b824fcd..bb4b1b7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ro/RomanianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs
index 367f344..836e46b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizer.cs
index d1c654e..026f7e1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
index 815c57d..c43237a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLetterTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilter.cs
index 2ee00db..6a14022 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Ru
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilterFactory.cs
index a2a6c7b..943991d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemmer.cs
index 14d188a..4e22e56 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Ru/RussianLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Ru
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapper.cs b/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapper.cs
index fdfd1ce..d0f33cf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapper.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleAnalyzerWrapper.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilter.cs
index 1d29a76..8f1310d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilterFactory.cs
index 41f4d9b..b5f06eb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Shingle/ShingleFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/DateRecognizerSinkFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/DateRecognizerSinkFilter.cs
index 64febfc..bdc2328 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/DateRecognizerSinkFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/DateRecognizerSinkFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 using System.Globalization;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TeeSinkTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TeeSinkTokenFilter.cs
index f66cd8c..89ad4e6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TeeSinkTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TeeSinkTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenRangeSinkFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenRangeSinkFilter.cs
index 5f7c0fa..a62ebdb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenRangeSinkFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenRangeSinkFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System;
 
 namespace Lucene.Net.Analysis.Sinks
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenTypeSinkFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenTypeSinkFilter.cs
index f473bdc..4347e6f 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenTypeSinkFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sinks/TokenTypeSinkFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs
index 2691339..51b2a46 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.En;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Tr;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs
index 72a1fa5..c27635a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Tartarus.Snowball;
 using System;
 using System.Reflection;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs
index 3f5d654..e822d70 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Snowball/SnowballPorterFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Miscellaneous;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Tartarus.Snowball;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs
index b99a2f9..e817056 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilter.cs
index 6d629f8..49fa2e1 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Standard
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilterFactory.cs
index fb87766..b42365c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
index e3e51a8..2f09695 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 using Reader = System.IO.TextReader;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerFactory.cs
index a7cdb3c..bdc13f5 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using System.IO;
 using TokenizerFactory = Lucene.Net.Analysis.Util.TokenizerFactory;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs
index 4457b44..6a2deb9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/ClassicTokenizerImpl.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 /* The following code was generated by JFlex 1.5.1 */
 using System;
 using System.IO;
@@ -813,4 +814,4 @@ namespace Lucene.Net.Analysis.Standard
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs
index b5b9b9e..a62e3c8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardAnalyzer.cs
@@ -1,4 +1,5 @@
-using System.IO;
+// Lucene version compatibility level 4.8.1
+using System.IO;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilter.cs
index 0c78b06..978d062 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 
 namespace Lucene.Net.Analysis.Standard
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilterFactory.cs
index 1a7a053..276f43a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
index 007aa38..30d6abd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard.Std31;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard.Std31;
 using Lucene.Net.Analysis.Standard.Std34;
 using Lucene.Net.Analysis.Standard.Std40;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerFactory.cs
index bd959c5..efdc782 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs
index ea8acb6..af84bec 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerImpl.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 // The following code was generated by JFlex 1.5.1
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
@@ -1400,4 +1401,4 @@ namespace Lucene.Net.Analysis.Standard
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs
index c750d7a..7b3a817 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/StandardTokenizerInterface.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Standard
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs
index 762355f..8e9afc4 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/StandardTokenizerImpl31.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 
@@ -1095,4 +1096,4 @@ namespace Lucene.Net.Analysis.Standard.Std31
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs
index fa729ee..afded04 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std31/UAX29URLEmailTokenizerImpl31.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
@@ -3656,4 +3657,4 @@ namespace Lucene.Net.Analysis.Standard.Std31
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs
index b00c698..487571e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/StandardTokenizerImpl34.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 
@@ -1113,4 +1114,4 @@ namespace Lucene.Net.Analysis.Standard.Std34
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs
index aed0257..9ca6376 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std34/UAX29URLEmailTokenizerImpl34.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
@@ -3771,4 +3772,4 @@ namespace Lucene.Net.Analysis.Standard.Std34
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs
index e3acd5c..6a854f6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std36/UAX29URLEmailTokenizerImpl36.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
@@ -4219,4 +4220,4 @@ namespace Lucene.Net.Analysis.Standard.Std36
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs
index 432f8fa..1665c1a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/StandardTokenizerImpl40.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 
@@ -1232,4 +1233,4 @@ namespace Lucene.Net.Analysis.Standard.Std40
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs
index 19e3346..687dca7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/Std40/UAX29URLEmailTokenizerImpl40.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
@@ -4437,4 +4438,4 @@ namespace Lucene.Net.Analysis.Standard.Std40
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs
index a42fe82..7fe787d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
index 1fe1952..c7b0bde 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Standard.Std31;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Standard.Std31;
 using Lucene.Net.Analysis.Standard.Std34;
 using Lucene.Net.Analysis.Standard.Std36;
 using Lucene.Net.Analysis.Standard.Std40;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerFactory.cs
index 497c731..1647224 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs
index d2565c4..c4ab7b7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Standard/UAX29URLEmailTokenizerImpl.cs
@@ -1,3 +1,4 @@
+// Lucene version compatibility level 4.8.1
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
@@ -9582,4 +9583,4 @@ namespace Lucene.Net.Analysis.Standard
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs
index 3cc7bdd..ce59fa3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilter.cs
index 97258f5b..ddd745e 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Sv
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilterFactory.cs
index 49c2e0f..86ac0bf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemmer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemmer.cs
index e475d93..28f0d13 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Sv/SwedishLightStemmer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 
 namespace Lucene.Net.Analysis.Sv
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs
index 1b05100..dff8b69 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/FSTSynonymFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilter.cs
index 9cf83b7..c6610bf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs
index 4538724..20ba711 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymMap.cs
index bd896d3..ed61071 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SlowSynonymMap.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs
index ef998d9..59236dd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SolrSynonymParser.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
index 50622b7..18ef911 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Numerics;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilterFactory.cs
index 3688146..e1fc997 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
index 3e21e9d..d79074a 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/SynonymMap.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Store;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/WordnetSynonymParser.cs b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/WordnetSynonymParser.cs
index a83900f..ea02d11 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Synonym/WordnetSynonymParser.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Synonym/WordnetSynonymParser.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System;
 using System.IO;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs
index b05b8e6..64d5278 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiAnalyzer.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Standard;
 using Lucene.Net.Analysis.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
index d1f80f1..e3e7323 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizer.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using ICU4N.Text;
 using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizerFactory.cs
index 3eb0e5e..b655274 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiTokenizerFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using Lucene.Net.Analysis.Util;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
index 03f5cce..07a0886 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilter.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using ICU4N.Text;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilterFactory.cs
index 8e88f5b..ad43f8c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Th/ThaiWordFilterFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilter.cs
index 41166fd..f5a23c9 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Tr
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilterFactory.cs
index 5ad237e..3ccfc89 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Tr/ApostropheFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs
index ba62c12..de7e061 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishAnalyzer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Core;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Core;
 using Lucene.Net.Analysis.Miscellaneous;
 using Lucene.Net.Analysis.Snowball;
 using Lucene.Net.Analysis.Standard;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilter.cs
index c771754..ab6c64b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilter.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.Globalization;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilterFactory.cs
index 30e9c77..ec97618 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Tr/TurkishLowerCaseFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
index 1ae793a..8046a81 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/AbstractAnalysisFactory.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Analysis.Core;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/AnalysisSPILoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/AnalysisSPILoader.cs
index d363c5c..f109cdd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/AnalysisSPILoader.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/AnalysisSPILoader.cs
@@ -1,4 +1,5 @@
-using J2N.Collections.Generic.Extensions;
+// Lucene version compatibility level 4.8.1
+using J2N.Collections.Generic.Extensions;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
index 0071147..bcb394d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs
@@ -1,4 +1,5 @@
-// This class was sourced from the Apache Harmony project's BufferedReader
+// Lucene version compatibility level 4.8.1
+// This class was sourced from the Apache Harmony project's BufferedReader
 // https://svn.apache.org/repos/asf/harmony/enhanced/java/trunk/
 
 using Lucene.Net.Analysis.CharFilters;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayIterator.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayIterator.cs
index 7f014cd..5c7fe63 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayIterator.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayIterator.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using ICU4N.Support.Text;
 using Lucene.Net.Support;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
index 4838472..15cb538 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArrayMap.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Globalization;
 using J2N.Text;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
index 465b953..bdb8211 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharArraySet.cs
@@ -1,4 +1,5 @@
-using J2N.Globalization;
+// Lucene version compatibility level 4.8.1
+using J2N.Globalization;
 using J2N.Text;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharFilterFactory.cs
index 2c14cb6..f0e813d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 using System.IO;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
index bfb15ba..c1797fa2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharTokenizer.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
index 1982064..4e9c2fd 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/CharacterUtils.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using J2N.Text;
 using Lucene.Net.Diagnostics;
 using Lucene.Net.Support;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs
index c479f76..2d8c959 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ClasspathResourceLoader.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using System;
 using System.IO;
 using System.Reflection;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilter.cs
index 4209310..399a005 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 
 namespace Lucene.Net.Analysis.Util
 {
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilterFactory.cs
index 2f76cad..2dffe6b 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ElisionFilterFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Fr;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Fr;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs
index 11acd07..6d8f2c6 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/FilesystemResourceLoader.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Util
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/FilteringTokenFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/FilteringTokenFilter.cs
index e7af13a..96b2c8c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/FilteringTokenFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/FilteringTokenFilter.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Util;
 using System;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/MultiTermAwareComponent.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/MultiTermAwareComponent.cs
index 01fb61a..c197a7d 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/MultiTermAwareComponent.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/MultiTermAwareComponent.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Util
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Util
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/OpenStringBuilder.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/OpenStringBuilder.cs
index f2601bc..bf6e506 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/OpenStringBuilder.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/OpenStringBuilder.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using System;
 using System.Diagnostics.CodeAnalysis;
 using System.Text;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs
index a00bd16..b20dc82 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoader.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.IO;
 
 namespace Lucene.Net.Analysis.Util
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoaderAware.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoaderAware.cs
index 6d8fe1c..d810ddb 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoaderAware.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/ResourceLoaderAware.cs
@@ -1,4 +1,5 @@
-namespace Lucene.Net.Analysis.Util
+// Lucene version compatibility level 4.8.1
+namespace Lucene.Net.Analysis.Util
 {
     /*
      * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/RollingCharBuffer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/RollingCharBuffer.cs
index 103edce..453d4d3 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/RollingCharBuffer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/RollingCharBuffer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using Lucene.Net.Util;
 using System;
 using System.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/SegmentingTokenizerBase.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/SegmentingTokenizerBase.cs
index 259365c..d19b8f8 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/SegmentingTokenizerBase.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/SegmentingTokenizerBase.cs
@@ -1,4 +1,5 @@
-#if FEATURE_BREAKITERATOR
+// Lucene version compatibility level 4.8.1
+#if FEATURE_BREAKITERATOR
 using ICU4N.Text;
 using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Diagnostics;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/StemmerUtil.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/StemmerUtil.cs
index a8e5d63..e14c3d2 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/StemmerUtil.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/StemmerUtil.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Diagnostics;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Diagnostics;
 using System;
 using System.Diagnostics;
 
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
index 8e0a86c..1e4fcad 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/StopwordAnalyzerBase.cs
@@ -1,4 +1,5 @@
-using J2N;
+// Lucene version compatibility level 4.8.1
+using J2N;
 using Lucene.Net.Util;
 using System;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenFilterFactory.cs
index be421df..a7e1edf 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenFilterFactory.cs
@@ -1,4 +1,5 @@
-using System;
+// Lucene version compatibility level 4.8.1
+using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Analysis.Util
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenizerFactory.cs
index 6d7587d..1b2e854 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/TokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
index 27230cd..ee0c46c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/WordlistLoader.cs
@@ -1,4 +1,5 @@
-using J2N.Text;
+// Lucene version compatibility level 4.8.1
+using J2N.Text;
 using Lucene.Net.Util;
 using System;
 using System.Collections.Generic;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
index 8adb755..42df03c 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizer.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerFactory.cs b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerFactory.cs
index 2e54313..0c214f7 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerFactory.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.Util;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.Util;
 using Lucene.Net.Support;
 using Lucene.Net.Util;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerImpl.cs b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerImpl.cs
index ac043c6..4506057 100644
--- a/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerImpl.cs
+++ b/src/Lucene.Net.Analysis.Common/Analysis/Wikipedia/WikipediaTokenizerImpl.cs
@@ -1,4 +1,5 @@
-using Lucene.Net.Analysis.TokenAttributes;
+// Lucene version compatibility level 4.8.1
+using Lucene.Net.Analysis.TokenAttributes;
 using System;
 using System.IO;
 using System.Text;
@@ -1077,4 +1078,4 @@ namespace Lucene.Net.Analysis.Wikipedia
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
index 8e29c90..e6b623a 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationAttributeFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using Icu.Collation;
 using Lucene.Net.Collation.TokenAttributes;
 using Lucene.Net.Util;
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
index 90dc233..d452cf8 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyAnalyzer.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using Icu.Collation;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.Core;
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
index d45d7e2..c18c8cd 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilter.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using Icu.Collation;
 using Lucene.Net.Analysis;
 using Lucene.Net.Analysis.TokenAttributes;
diff --git a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
index 081aaa9..bc9b08c 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/CollationKeyFilterFactory.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using Icu;
 using Icu.Collation;
 using Lucene.Net.Analysis;
diff --git a/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs b/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
index 63fdacc..78141ec 100644
--- a/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
+++ b/src/Lucene.Net.Analysis.Common/Collation/TokenAttributes/CollatedTermAttributeImpl.cs
@@ -1,4 +1,5 @@
-#if FEATURE_COLLATION
+// Lucene version compatibility level 4.8.1
+#if FEATURE_COLLATION
 using Icu.Collation;
 using Lucene.Net.Analysis.TokenAttributes;
 using System;
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Among.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Among.cs
index 3e2bf8c..ebae4bf 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Among.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Among.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -106,4 +107,4 @@ namespace Lucene.Net.Tartarus.Snowball
 
         private readonly SnowballProgram methodobject;
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ArmenianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ArmenianStemmer.cs
index 36834b6..59758b8 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ArmenianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ArmenianStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -586,4 +587,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/BasqueStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/BasqueStemmer.cs
index 7a19872..b6fbd43 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/BasqueStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/BasqueStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1065,4 +1066,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/CatalanStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/CatalanStemmer.cs
index 5da391d..c2a3c13 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/CatalanStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/CatalanStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1161,4 +1162,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DanishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DanishStemmer.cs
index 7425dfa..4070fac 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DanishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DanishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -504,4 +505,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DutchStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DutchStemmer.cs
index 980dd4d..c236ea1 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DutchStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/DutchStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1014,4 +1015,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/EnglishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/EnglishStemmer.cs
index 5920220..9ce74f8 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/EnglishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/EnglishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1552,4 +1553,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FinnishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FinnishStemmer.cs
index 653cb4e..1109211 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FinnishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FinnishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1182,4 +1183,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
index f10cfcd..70436c4 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/FrenchStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1772,4 +1773,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
index bd30ae0..a166640 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/German2Stemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -892,4 +893,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
index 499caee..0abf45d 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/GermanStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -847,4 +848,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
index 7b0e40d..ac44c84 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/HungarianStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1254,4 +1255,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/IrishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/IrishStemmer.cs
index ddbb8bf..bdbc4a3 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/IrishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/IrishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -650,4 +651,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ItalianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ItalianStemmer.cs
index d492ed4..31f4b1c 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ItalianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/ItalianStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1345,4 +1346,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/KpStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/KpStemmer.cs
index e5c7a7a..3325fbb 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/KpStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/KpStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -2455,4 +2456,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/LovinsStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/LovinsStemmer.cs
index 77e3941..6314ee7 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/LovinsStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/LovinsStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -2098,4 +2099,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/NorwegianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/NorwegianStemmer.cs
index 02084df..e3d0459 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/NorwegianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/NorwegianStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -423,4 +424,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PorterStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PorterStemmer.cs
index 43dcce1..1205234 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PorterStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PorterStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1051,4 +1052,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PortugueseStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PortugueseStemmer.cs
index c826d41..17a0580 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PortugueseStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/PortugueseStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1268,4 +1269,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RomanianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RomanianStemmer.cs
index 6e97e86..0443cf1 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RomanianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RomanianStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1185,4 +1186,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RussianStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RussianStemmer.cs
index 46a0db8..5c52f76 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RussianStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/RussianStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -833,4 +834,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SpanishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SpanishStemmer.cs
index 4317dea..3558056 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SpanishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SpanishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -1319,4 +1320,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SwedishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SwedishStemmer.cs
index e08dbc1..82463f8 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SwedishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/SwedishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -410,4 +411,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/TurkishStemmer.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/TurkishStemmer.cs
index bfa33c5..e7902bc 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/TurkishStemmer.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/Ext/TurkishStemmer.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -3738,4 +3739,4 @@ namespace Lucene.Net.Tartarus.Snowball.Ext
             return this.GetType().FullName.GetHashCode();
         }
     }
-}
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/SnowballProgram.cs b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/SnowballProgram.cs
index 04a60b2..e0686b9 100644
--- a/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/SnowballProgram.cs
+++ b/src/Lucene.Net.Analysis.Common/Tartarus/Snowball/SnowballProgram.cs
@@ -1,4 +1,5 @@
-/*
+// Lucene version compatibility level 4.8.1
+/*
 
 Copyright (c) 2001, Dr Martin Porter
 Copyright (c) 2002, Richard Boulton
@@ -538,4 +539,4 @@ namespace Lucene.Net.Tartarus.Snowball
         }
         */
     }
-}
+}
\ No newline at end of file


[lucenenet] 03/08: Lucene.Net.Tests.Analysis.Common.csproj: Simplified embedded resource references

Posted by ni...@apache.org.
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 beab426c44461ff1c45a9d4ae96690164a0947c1
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Sun Feb 21 22:28:57 2021 +0700

    Lucene.Net.Tests.Analysis.Common.csproj: Simplified embedded resource references
---
 .../Lucene.Net.Tests.Analysis.Common.csproj                         | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index cea9247..58188ec 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -28,7 +28,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <EmbeddedResource Include="Analysis\En\porterTestData.zip;Analysis\En\kstemTestData.zip;Analysis\Snowball\TestSnowballVocabData.zip;Analysis\Fr\frlighttestdata.zip;Analysis\Fr\frminimaltestdata.zip;Analysis\De\delighttestdata.zip;Analysis\De\deminimaltestdata.zip;Analysis\Es\eslighttestdata.zip;Analysis\Ru\rulighttestdata.zip;Analysis\Ckb\ckbtestdata.zip;Analysis\Fi\filighttestdata.zip;Analysis\Gl\gltestdata.zip;Analysis\Pt\ptlighttestdata.zip;Analysis\Pt\ptminimaltestdata.zip;Analys [...]
+    <EmbeddedResource Include="**/*.dic;**/*.aff" Label="Hunspell Dictionary and Affix Test Data" />
+    <EmbeddedResource Include="**/*.zip" Exclude="bin/**/*.zip;obj/**/*.zip" Label="Zip Test Data" />
+    <EmbeddedResource Include="**/*.txt" Exclude="bin/**/*.txt;obj/**/*.txt" Label="Text Test Data" />
+    <EmbeddedResource Include="**/*.htm;**/*.html" Exclude="bin/**/*.htm;obj/**/*.htm;bin/**/*.html;obj/**/*.html" Label="HTML Test Data" />
+    <EmbeddedResource Include="**/*.xml" Exclude="bin/**/*.xml;obj/**/*.xml" Label="XML Test Data" />
   </ItemGroup>
 
   <ItemGroup>


[lucenenet] 07/08: Lucene.Net.Tests.Analysis.Common: Removed dependency on System.Text.Encoding.Codepages, as it is not required in .NET Core 2.x and higher

Posted by ni...@apache.org.
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 88ae70443edceb3b0a541d7ae5e90828654b01ff
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Thu Feb 25 07:31:28 2021 +0700

    Lucene.Net.Tests.Analysis.Common: Removed dependency on System.Text.Encoding.Codepages, as it is not required in .NET Core 2.x and higher
---
 .../Lucene.Net.Tests.Analysis.Common.csproj                          | 5 -----
 src/Lucene.Net.Tests.Analysis.Common/Startup.cs                      | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
index 0e8f2eb..b4b3e9a 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
+++ b/src/Lucene.Net.Tests.Analysis.Common/Lucene.Net.Tests.Analysis.Common.csproj
@@ -48,14 +48,9 @@
   <Import Project="$(SolutionDir)build/TestReferences.Common.targets" />
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
     <PackageReference Include="System.Net.Primitives" Version="$(SystemNetPrimitivesPackageVersion)" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp2.1' ">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesPackageVersion)" />
-  </ItemGroup>
-
   <ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.IO.Compression" />
   </ItemGroup>
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Startup.cs b/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
index a9502ca..7cdc10d 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Startup.cs
@@ -26,6 +26,10 @@ public class Startup : LuceneTestFrameworkInitializer
     protected override void TestFrameworkSetUp()
     {
 #if FEATURE_ENCODINGPROVIDERS
+        // LUCENENET NOTE: Hunspell manual tests require additional encoding types. End users may
+        // require it to be added as well when using Hunspell, but there is no reason to load
+        // the code pages by default in Lucene.Net.Analysis.Common. It should be added by consumers
+        // or Hunspell that require it.
         System.Text.Encoding.RegisterProvider(System.Text.CodePagesEncodingProvider.Instance);
 #endif
     }


[lucenenet] 08/08: Lucene.Net.Tests.Analysis.Common.Analysis.Hunspell: Changed TestAllDictionaries and TestAllDictionaries2 data path to the root of the repo to match the .gitignore file

Posted by ni...@apache.org.
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 6ff2ab28138f9e8d2e5ce9de481f5349bc987a02
Author: Shad Storhaug <sh...@shadstorhaug.com>
AuthorDate: Thu Feb 25 07:46:20 2021 +0700

    Lucene.Net.Tests.Analysis.Common.Analysis.Hunspell: Changed TestAllDictionaries and TestAllDictionaries2 data path to the root of the repo to match the .gitignore file
---
 .../Analysis/Hunspell/TestAllDictionaries.cs                          | 2 +-
 .../Analysis/Hunspell/TestAllDictionaries2.cs                         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
index f19734f..7c3b0f9 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries.cs
@@ -47,7 +47,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
         // set this to the location of where you downloaded all the files
         internal static readonly DirectoryInfo DICTIONARY_HOME = new DirectoryInfo(
-            System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).Assembly.Location).Parent.Parent.Parent.Parent.Parent.FullName,
+            System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).Assembly.Location).Parent.Parent.Parent.Parent.Parent.Parent.FullName,
                 @"test-files\analysis\data\dictionaries"));
 
         internal readonly string[] tests = new string[] 
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
index a05e8d9..9501ade 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Hunspell/TestAllDictionaries2.cs
@@ -43,7 +43,7 @@ namespace Lucene.Net.Analysis.Hunspell
 
         // set this to the location of where you downloaded all the files
         internal static readonly DirectoryInfo DICTIONARY_HOME = new DirectoryInfo(
-            System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).Assembly.Location).Parent.Parent.Parent.Parent.Parent.FullName,
+            System.IO.Path.Combine(new DirectoryInfo(typeof(TestAllDictionaries2).Assembly.Location).Parent.Parent.Parent.Parent.Parent.Parent.FullName,
                 @"test-files\analysis\data\thunderbirdDicts"));
 
         internal readonly string[] tests = new string[]
@@ -171,7 +171,7 @@ namespace Lucene.Net.Analysis.Hunspell
             "verificador_ortografico_para_portugues_do_brasil-2.3-3.2b1-tb+sm+fn+fx.xpi",     "dictionaries/pt_BR.dic",             "dictionaries/pt_BR.aff",
             "vietnamese_dictionary-2.1.0.159-an+sm+tb+fx+fn.xpi",                             "dictionaries/vi-DauCu.dic",          "dictionaries/vi-DauCu.aff",
             "vietnamese_dictionary-2.1.0.159-an+sm+tb+fx+fn.xpi",                             "dictionaries/vi-DauMoi.dic",         "dictionaries/vi-DauMoi.aff",
-// LUCENENET BUG: System.ArgumentException : expected only one flag, got: Kc            "woordenboek_nederlands-3.1.1-sm+tb+fx+fn.xpi",                                   "dictionaries/nl.dic",                "dictionaries/nl.aff",
+// LUCENENET TODO: BUG: System.ArgumentException : expected only one flag, got: Kc            "woordenboek_nederlands-3.1.1-sm+tb+fx+fn.xpi",                                   "dictionaries/nl.dic",                "dictionaries/nl.aff",
             "xhosa_spell_checker-20110323-tb+fn+fx+sm.xpi",                                   "dictionaries/xh-ZA.dic",             "dictionaries/xh-ZA.aff",
             "xuxen-4.0.1-fx+tb+sm.xpi",                                                       "dictionaries/eu.dic",                "dictionaries/eu.aff",
             "yiddish_spell_checker_yivo-0.0.3-sm+fn+fx+tb.xpi",                               "dictionaries/yi.dic",                "dictionaries/yi.aff",