lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [13/50] [abbrv] lucenenet git commit: This reverts commit 1a8c4a116f8870479e85737bfecb8fe673e8347b (SWEEP: Lucene.Net.Core: Marked most (stateful) classes serializable)
Date Sat, 09 Sep 2017 00:31:31 GMT
This reverts commit 1a8c4a116f8870479e85737bfecb8fe673e8347b (SWEEP: Lucene.Net.Core: Marked most (stateful) classes serializable)

Per Microsoft, it is not considered a good practice anymore to make classes serializable unless strictly required due to security concerns.


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/389daee7
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/389daee7
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/389daee7

Branch: refs/heads/master
Commit: 389daee7358d66c260382710b65e36516ffd79aa
Parents: d5233f4
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Sat Sep 2 01:16:00 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Sat Sep 2 04:38:23 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net.Misc/Document/LazyDocument.cs    |   3 -
 .../Index/Sorter/BlockJoinComparatorSource.cs   |   3 -
 .../Sorter/EarlyTerminatingSortingCollector.cs  |   3 -
 .../Index/Sorter/SortingAtomicReader.cs         |  30 -----
 .../Index/Sorter/SortingMergePolicy.cs          |   3 -
 src/Lucene.Net/Analysis/Token.cs                |   4 -
 .../TokenAttributes/CharTermAttribute.cs        |   3 -
 .../Analysis/TokenAttributes/FlagsAttribute.cs  |   3 -
 .../TokenAttributes/KeywordAttribute.cs         |   5 -
 .../Analysis/TokenAttributes/OffsetAttribute.cs |   5 -
 .../TokenAttributes/PayloadAttribute.cs         |   5 -
 .../PositionIncrementAttribute.cs               |   3 -
 .../TokenAttributes/PositionLengthAttribute.cs  |   3 -
 .../Analysis/TokenAttributes/TypeAttribute.cs   |   3 -
 src/Lucene.Net/Document/BinaryDocValuesField.cs |   4 -
 src/Lucene.Net/Document/ByteDocValuesField.cs   |   3 -
 .../Document/DerefBytesDocValuesField.cs        |   3 -
 src/Lucene.Net/Document/Document.cs             |   3 -
 .../Document/DocumentStoredFieldVisitor.cs      |   4 -
 src/Lucene.Net/Document/DoubleDocValuesField.cs |   3 -
 src/Lucene.Net/Document/DoubleField.cs          |   3 -
 src/Lucene.Net/Document/Field.cs                |   3 -
 src/Lucene.Net/Document/FieldType.cs            |   3 -
 src/Lucene.Net/Document/FloatDocValuesField.cs  |   5 -
 src/Lucene.Net/Document/FloatField.cs           |   3 -
 src/Lucene.Net/Document/IntDocValuesField.cs    |   3 -
 src/Lucene.Net/Document/IntField.cs             |   3 -
 src/Lucene.Net/Document/LongDocValuesField.cs   |   3 -
 src/Lucene.Net/Document/LongField.cs            |   3 -
 .../Document/NumericDocValuesField.cs           |   3 -
 .../Document/PackedLongDocValuesField.cs        |   3 -
 src/Lucene.Net/Document/ShortDocValuesField.cs  |   3 -
 .../Document/SortedBytesDocValuesField.cs       |   3 -
 src/Lucene.Net/Document/SortedDocValuesField.cs |   4 -
 .../Document/SortedSetDocValuesField.cs         |   4 -
 src/Lucene.Net/Document/StoredField.cs          |   4 -
 .../Document/StraightBytesDocValuesField.cs     |   3 -
 src/Lucene.Net/Document/StringField.cs          |   4 -
 src/Lucene.Net/Document/TextField.cs            |   4 -
 src/Lucene.Net/Index/AtomicReader.cs            |   3 -
 src/Lucene.Net/Index/AtomicReaderContext.cs     |   4 -
 src/Lucene.Net/Index/AutomatonTermsEnum.cs      |   3 -
 src/Lucene.Net/Index/BaseCompositeReader.cs     |   3 -
 src/Lucene.Net/Index/BinaryDocValues.cs         |   5 -
 .../Index/BinaryDocValuesFieldUpdates.cs        |   9 --
 src/Lucene.Net/Index/BinaryDocValuesWriter.cs   |   3 -
 src/Lucene.Net/Index/BitsSlice.cs               |   3 -
 src/Lucene.Net/Index/BufferedUpdates.cs         |   3 -
 src/Lucene.Net/Index/BufferedUpdatesStream.cs   |  12 --
 src/Lucene.Net/Index/ByteSliceReader.cs         |   3 -
 src/Lucene.Net/Index/ByteSliceWriter.cs         |   4 -
 src/Lucene.Net/Index/CheckIndex.cs              |  24 ----
 src/Lucene.Net/Index/CoalescedUpdates.cs        |  12 --
 src/Lucene.Net/Index/CompositeReader.cs         |   3 -
 src/Lucene.Net/Index/CompositeReaderContext.cs  |   7 --
 .../Index/ConcurrentMergeScheduler.cs           |   3 -
 src/Lucene.Net/Index/DirectoryReader.cs         |   3 -
 src/Lucene.Net/Index/DocConsumer.cs             |   6 +-
 src/Lucene.Net/Index/DocFieldConsumer.cs        |   5 +-
 .../Index/DocFieldConsumerPerField.cs           |   6 +-
 src/Lucene.Net/Index/DocFieldProcessor.cs       |   7 +-
 .../Index/DocFieldProcessorPerField.cs          |   4 +-
 src/Lucene.Net/Index/DocInverter.cs             |   4 -
 src/Lucene.Net/Index/DocInverterPerField.cs     |   4 -
 src/Lucene.Net/Index/DocTermOrds.cs             |   9 --
 src/Lucene.Net/Index/DocValues.cs               |  23 ----
 src/Lucene.Net/Index/DocValuesFieldUpdates.cs   |  10 --
 src/Lucene.Net/Index/DocValuesProcessor.cs      |   3 -
 src/Lucene.Net/Index/DocValuesUpdate.cs         |  10 --
 src/Lucene.Net/Index/DocValuesWriter.cs         |   5 -
 src/Lucene.Net/Index/DocsAndPositionsEnum.cs    |   3 -
 src/Lucene.Net/Index/DocsEnum.cs                |   3 -
 src/Lucene.Net/Index/DocumentsWriter.cs         |  18 ---
 .../Index/DocumentsWriterDeleteQueue.cs         |  24 ----
 .../Index/DocumentsWriterFlushControl.cs        |   9 --
 .../Index/DocumentsWriterFlushQueue.cs          |  12 --
 .../Index/DocumentsWriterPerThread.cs           |  18 ---
 .../Index/DocumentsWriterPerThreadPool.cs       |   6 -
 .../Index/DocumentsWriterStallControl.cs        |   3 -
 src/Lucene.Net/Index/FieldInfo.cs               |   5 +-
 src/Lucene.Net/Index/FieldInfos.cs              |   9 --
 src/Lucene.Net/Index/FieldInvertState.cs        |   5 -
 src/Lucene.Net/Index/Fields.cs                  |   4 +-
 src/Lucene.Net/Index/FilterAtomicReader.cs      |  19 ---
 src/Lucene.Net/Index/FilterDirectoryReader.cs   |  10 --
 src/Lucene.Net/Index/FilteredTermsEnum.cs       |   4 -
 .../Index/FlushByRamOrCountsPolicy.cs           |   5 -
 src/Lucene.Net/Index/FlushPolicy.cs             |   4 -
 src/Lucene.Net/Index/FreqProxTermsWriter.cs     |   4 -
 .../Index/FreqProxTermsWriterPerField.cs        |   6 -
 src/Lucene.Net/Index/FrozenBufferedUpdates.cs   |  12 --
 src/Lucene.Net/Index/IndexCommit.cs             |   4 +-
 src/Lucene.Net/Index/IndexDeletionPolicy.cs     |   4 +-
 src/Lucene.Net/Index/IndexFileDeleter.cs        |  10 +-
 src/Lucene.Net/Index/IndexFileNames.cs          |   4 +-
 src/Lucene.Net/Index/IndexReader.cs             |   3 -
 src/Lucene.Net/Index/IndexReaderContext.cs      |   3 -
 src/Lucene.Net/Index/IndexWriter.cs             |   9 --
 src/Lucene.Net/Index/IndexWriterConfig.cs       |   3 -
 src/Lucene.Net/Index/InvertedDocConsumer.cs     |   5 +-
 .../Index/InvertedDocConsumerPerField.cs        |   6 +-
 src/Lucene.Net/Index/InvertedDocEndConsumer.cs  |   5 +-
 .../Index/InvertedDocEndConsumerPerField.cs     |   6 +-
 .../Index/KeepOnlyLastCommitDeletionPolicy.cs   |   5 +-
 src/Lucene.Net/Index/LiveIndexWriterConfig.cs   |   3 -
 src/Lucene.Net/Index/LogByteSizeMergePolicy.cs  |   5 -
 src/Lucene.Net/Index/LogDocMergePolicy.cs       |   6 +-
 src/Lucene.Net/Index/LogMergePolicy.cs          |   4 +-
 src/Lucene.Net/Index/MergePolicy.cs             |  11 +-
 src/Lucene.Net/Index/MergeScheduler.cs          |   3 -
 src/Lucene.Net/Index/MergeState.cs              |   4 -
 src/Lucene.Net/Index/MultiBits.cs               |   4 -
 src/Lucene.Net/Index/MultiDocValues.cs          |  22 ----
 .../Index/MultiDocsAndPositionsEnum.cs          |   8 +-
 src/Lucene.Net/Index/MultiDocsEnum.cs           |   8 +-
 src/Lucene.Net/Index/MultiFields.cs             |   5 +-
 src/Lucene.Net/Index/MultiReader.cs             |   4 -
 src/Lucene.Net/Index/MultiTerms.cs              |   4 +-
 src/Lucene.Net/Index/MultiTermsEnum.cs          |   9 --
 src/Lucene.Net/Index/NoDeletionPolicy.cs        |   4 -
 src/Lucene.Net/Index/NoMergePolicy.cs           |   4 -
 src/Lucene.Net/Index/NoMergeScheduler.cs        |   5 -
 src/Lucene.Net/Index/NormsConsumer.cs           |   5 +-
 src/Lucene.Net/Index/NormsConsumerPerField.cs   |   3 -
 src/Lucene.Net/Index/NumericDocValues.cs        |   5 -
 .../Index/NumericDocValuesFieldUpdates.cs       |   9 --
 src/Lucene.Net/Index/NumericDocValuesWriter.cs  |   4 -
 src/Lucene.Net/Index/OrdTermState.cs            |   4 -
 src/Lucene.Net/Index/ParallelAtomicReader.cs    |   3 -
 src/Lucene.Net/Index/ParallelCompositeReader.cs |  10 --
 src/Lucene.Net/Index/ParallelPostingsArray.cs   |   3 -
 .../Index/PersistentSnapshotDeletionPolicy.cs   |   3 -
 src/Lucene.Net/Index/PrefixCodedTerms.cs        |   9 --
 src/Lucene.Net/Index/RandomAccessOrds.cs        |   5 -
 src/Lucene.Net/Index/ReaderSlice.cs             |   5 -
 src/Lucene.Net/Index/ReaderUtil.cs              |   4 -
 src/Lucene.Net/Index/ReadersAndUpdates.cs       |   3 -
 src/Lucene.Net/Index/SegmentCommitInfo.cs       |   4 -
 src/Lucene.Net/Index/SegmentCoreReaders.cs      |   3 -
 src/Lucene.Net/Index/SegmentDocValues.cs        |   6 -
 src/Lucene.Net/Index/SegmentInfo.cs             |   3 -
 src/Lucene.Net/Index/SegmentInfos.cs            |   4 +-
 src/Lucene.Net/Index/SegmentMerger.cs           |   3 -
 src/Lucene.Net/Index/SegmentReadState.cs        |   5 -
 src/Lucene.Net/Index/SegmentReader.cs           |   4 -
 src/Lucene.Net/Index/SegmentWriteState.cs       |   5 -
 src/Lucene.Net/Index/SerialMergeScheduler.cs    |   5 -
 .../Index/SimpleMergedSegmentWarmer.cs          |   3 -
 src/Lucene.Net/Index/SingleTermsEnum.cs         |   5 -
 .../Index/SingletonSortedSetDocValues.cs        |   4 -
 .../Index/SlowCompositeReaderWrapper.cs         |   4 -
 src/Lucene.Net/Index/SnapshotDeletionPolicy.cs  |   3 -
 src/Lucene.Net/Index/SortedDocValues.cs         |   5 -
 .../Index/SortedDocValuesTermsEnum.cs           |   5 +-
 src/Lucene.Net/Index/SortedDocValuesWriter.cs   |   4 -
 src/Lucene.Net/Index/SortedSetDocValues.cs      |   5 -
 .../Index/SortedSetDocValuesTermsEnum.cs        |   5 +-
 .../Index/SortedSetDocValuesWriter.cs           |   3 -
 src/Lucene.Net/Index/StandardDirectoryReader.cs |   3 -
 src/Lucene.Net/Index/StoredFieldsConsumer.cs    |   6 +-
 src/Lucene.Net/Index/StoredFieldsProcessor.cs   |   3 -
 src/Lucene.Net/Index/TaskMergeScheduler.cs      |   3 -
 src/Lucene.Net/Index/TermState.cs               |   3 -
 src/Lucene.Net/Index/TermVectorsConsumer.cs     |   3 -
 .../Index/TermVectorsConsumerPerField.cs        |   6 -
 src/Lucene.Net/Index/Terms.cs                   |   5 +-
 src/Lucene.Net/Index/TermsEnum.cs               |   3 -
 src/Lucene.Net/Index/TermsHash.cs               |   4 -
 src/Lucene.Net/Index/TermsHashConsumer.cs       |   5 +-
 .../Index/TermsHashConsumerPerField.cs          |   4 -
 src/Lucene.Net/Index/TermsHashPerField.cs       |   6 -
 .../ThreadAffinityDocumentsWriterThreadPool.cs  |   4 -
 src/Lucene.Net/Index/TieredMergePolicy.cs       |   4 +-
 src/Lucene.Net/Index/TrackingIndexWriter.cs     |   5 +-
 src/Lucene.Net/Index/TwoPhaseCommitTool.cs      |   3 -
 .../Index/TwoStoredFieldsConsumers.cs           |   3 -
 src/Lucene.Net/Index/UpgradeIndexMergePolicy.cs |   3 -
 src/Lucene.Net/Search/AutomatonQuery.cs         |   3 -
 src/Lucene.Net/Search/BitsFilteredDocIdSet.cs   |   3 -
 src/Lucene.Net/Search/BooleanQuery.cs           |   3 -
 src/Lucene.Net/Search/BooleanScorer.cs          |   4 -
 src/Lucene.Net/Search/BooleanScorer2.cs         |  19 ---
 src/Lucene.Net/Search/BoostAttributeImpl.cs     |   5 -
 src/Lucene.Net/Search/BulkScorer.cs             |   6 +-
 src/Lucene.Net/Search/CachingCollector.cs       |  18 ---
 src/Lucene.Net/Search/CachingWrapperFilter.cs   |   7 --
 src/Lucene.Net/Search/CollectionStatistics.cs   |   4 -
 src/Lucene.Net/Search/ComplexExplanation.cs     |   3 -
 src/Lucene.Net/Search/ConjunctionScorer.cs      |   4 -
 .../Search/ConstantScoreAutoRewrite.cs          |  10 --
 src/Lucene.Net/Search/ConstantScoreQuery.cs     |  15 ---
 .../Search/ControlledRealTimeReopenThread.cs    |   6 -
 src/Lucene.Net/Search/DisjunctionMaxQuery.cs    |   6 -
 src/Lucene.Net/Search/DisjunctionMaxScorer.cs   |   3 -
 src/Lucene.Net/Search/DisjunctionScorer.cs      |   4 -
 src/Lucene.Net/Search/DisjunctionSumScorer.cs   |   5 -
 src/Lucene.Net/Search/DocIdSet.cs               |   3 -
 src/Lucene.Net/Search/DocIdSetIterator.cs       |   4 -
 src/Lucene.Net/Search/DocTermOrdsRangeFilter.cs |  10 +-
 .../Search/DocTermOrdsRewriteMethod.cs          |  13 ---
 src/Lucene.Net/Search/ExactPhraseScorer.cs      |   7 --
 src/Lucene.Net/Search/Explanation.cs            |   4 -
 src/Lucene.Net/Search/FakeScorer.cs             |   4 -
 src/Lucene.Net/Search/FieldCache.cs             |  75 ------------
 src/Lucene.Net/Search/FieldCacheDocIdSet.cs     |  20 ----
 src/Lucene.Net/Search/FieldCacheImpl.cs         | 117 -------------------
 src/Lucene.Net/Search/FieldCacheRangeFilter.cs  |  31 +----
 .../Search/FieldCacheRewriteMethod.cs           |  13 ---
 src/Lucene.Net/Search/FieldCacheTermsFilter.cs  |   9 +-
 src/Lucene.Net/Search/FieldComparator.cs        |  39 -------
 src/Lucene.Net/Search/FieldComparatorSource.cs  |   5 -
 src/Lucene.Net/Search/FieldDoc.cs               |   4 -
 src/Lucene.Net/Search/FieldValueFilter.cs       |   9 --
 src/Lucene.Net/Search/FieldValueHitQueue.cs     |  12 --
 src/Lucene.Net/Search/Filter.cs                 |   3 -
 src/Lucene.Net/Search/FilteredDocIdSet.cs       |  11 --
 .../Search/FilteredDocIdSetIterator.cs          |   5 -
 src/Lucene.Net/Search/FilteredQuery.cs          |  30 -----
 src/Lucene.Net/Search/FuzzyQuery.cs             |   3 -
 src/Lucene.Net/Search/FuzzyTermsEnum.cs         |   9 --
 src/Lucene.Net/Search/HitQueue.cs               |   5 -
 src/Lucene.Net/Search/IndexSearcher.cs          |  15 ---
 src/Lucene.Net/Search/LiveFieldValues.cs        |   4 +-
 src/Lucene.Net/Search/MatchAllDocsQuery.cs      |  10 --
 .../Search/MinShouldMatchSumScorer.cs           |   3 -
 src/Lucene.Net/Search/MultiCollector.cs         |   5 -
 src/Lucene.Net/Search/MultiPhraseQuery.cs       |  15 ---
 src/Lucene.Net/Search/MultiTermQuery.cs         |  21 ----
 .../Search/MultiTermQueryWrapperFilter.cs       |   4 -
 src/Lucene.Net/Search/NGramPhraseQuery.cs       |   4 -
 src/Lucene.Net/Search/NumericRangeFilter.cs     |   3 -
 src/Lucene.Net/Search/NumericRangeQuery.cs      |  12 --
 .../Search/Payloads/AveragePayloadFunction.cs   |   5 -
 .../Search/Payloads/MaxPayloadFunction.cs       |   3 -
 .../Search/Payloads/MinPayloadFunction.cs       |   3 -
 .../Search/Payloads/PayloadFunction.cs          |   5 -
 .../Search/Payloads/PayloadNearQuery.cs         |   9 --
 .../Search/Payloads/PayloadSpanUtil.cs          |   4 -
 .../Search/Payloads/PayloadTermQuery.cs         |  11 --
 src/Lucene.Net/Search/PhrasePositions.cs        |   4 -
 src/Lucene.Net/Search/PhraseQuery.cs            |   9 --
 src/Lucene.Net/Search/PhraseQueue.cs            |   4 -
 .../Search/PositiveScoresOnlyCollector.cs       |   5 -
 src/Lucene.Net/Search/PrefixFilter.cs           |   4 -
 src/Lucene.Net/Search/PrefixQuery.cs            |   3 -
 src/Lucene.Net/Search/PrefixTermsEnum.cs        |   5 -
 src/Lucene.Net/Search/QueryRescorer.cs          |  12 --
 src/Lucene.Net/Search/QueryWrapperFilter.cs     |   8 --
 src/Lucene.Net/Search/ReferenceManager.cs       |   3 -
 src/Lucene.Net/Search/RegexpQuery.cs            |   6 -
 src/Lucene.Net/Search/ReqExclScorer.cs          |   4 -
 src/Lucene.Net/Search/ReqOptSumScorer.cs        |   4 -
 src/Lucene.Net/Search/Rescorer.cs               |   6 +-
 .../Search/ScoreCachingWrappingScorer.cs        |   4 -
 src/Lucene.Net/Search/ScoreDoc.cs               |   5 -
 src/Lucene.Net/Search/Scorer.cs                 |   7 --
 src/Lucene.Net/Search/ScoringRewrite.cs         |  15 ---
 src/Lucene.Net/Search/SearcherFactory.cs        |   5 -
 .../Search/SearcherLifetimeManager.cs           |  10 +-
 src/Lucene.Net/Search/SearcherManager.cs        |   3 -
 .../Search/Similarities/AfterEffect.cs          |   8 --
 .../Search/Similarities/AfterEffectB.cs         |   5 -
 .../Search/Similarities/AfterEffectL.cs         |   5 -
 .../Search/Similarities/BM25Similarity.cs       |   9 --
 .../Search/Similarities/BasicModel.cs           |   5 -
 .../Search/Similarities/BasicModelBE.cs         |   3 -
 .../Search/Similarities/BasicModelD.cs          |   3 -
 .../Search/Similarities/BasicModelG.cs          |   5 -
 .../Search/Similarities/BasicModelIF.cs         |   5 -
 .../Search/Similarities/BasicModelIn.cs         |   5 -
 .../Search/Similarities/BasicModelIne.cs        |   3 -
 .../Search/Similarities/BasicModelP.cs          |   3 -
 .../Search/Similarities/BasicStats.cs           |   5 -
 .../Search/Similarities/DFRSimilarity.cs        |   5 -
 .../Search/Similarities/DefaultSimilarity.cs    |   3 -
 .../Search/Similarities/Distribution.cs         |   5 -
 .../Search/Similarities/DistributionLL.cs       |   3 -
 .../Search/Similarities/DistributionSPL.cs      |   3 -
 .../Search/Similarities/IBSimilarity.cs         |   4 -
 .../Similarities/LMDirichletSimilarity.cs       |   3 -
 .../Similarities/LMJelinekMercerSimilarity.cs   |   3 -
 .../Search/Similarities/LMSimilarity.cs         |  10 --
 src/Lucene.Net/Search/Similarities/Lambda.cs    |   5 -
 src/Lucene.Net/Search/Similarities/LambdaDF.cs  |   5 -
 src/Lucene.Net/Search/Similarities/LambdaTTF.cs |   5 -
 .../Search/Similarities/MultiSimilarity.cs      |  11 --
 .../Search/Similarities/Normalization.cs        |   8 --
 .../Search/Similarities/NormalizationH1.cs      |   5 -
 .../Search/Similarities/NormalizationH2.cs      |   5 -
 .../Search/Similarities/NormalizationH3.cs      |   5 -
 .../Search/Similarities/NormalizationZ.cs       |   3 -
 .../Similarities/PerFieldSimilarityWrapper.cs   |   8 --
 .../Search/Similarities/Similarity.cs           |  11 --
 .../Search/Similarities/SimilarityBase.cs       |   6 -
 .../Search/Similarities/TFIDFSimilarity.cs      |  10 --
 src/Lucene.Net/Search/SloppyPhraseScorer.cs     |   6 -
 src/Lucene.Net/Search/Sort.cs                   |   4 -
 src/Lucene.Net/Search/SortField.cs              |   9 --
 src/Lucene.Net/Search/SortRescorer.cs           |   7 +-
 .../Search/Spans/FieldMaskingSpanQuery.cs       |   3 -
 src/Lucene.Net/Search/Spans/NearSpansOrdered.cs |   6 -
 .../Search/Spans/NearSpansUnordered.cs          |   9 --
 src/Lucene.Net/Search/Spans/SpanFirstQuery.cs   |   4 -
 .../Search/Spans/SpanMultiTermQueryWrapper.cs   |  19 ---
 .../Search/Spans/SpanNearPayloadCheckQuery.cs   |   4 -
 src/Lucene.Net/Search/Spans/SpanNearQuery.cs    |   3 -
 src/Lucene.Net/Search/Spans/SpanNotQuery.cs     |   6 -
 src/Lucene.Net/Search/Spans/SpanOrQuery.cs      |   9 --
 .../Search/Spans/SpanPayloadCheckQuery.cs       |   3 -
 .../Search/Spans/SpanPositionCheckQuery.cs      |   7 --
 .../Search/Spans/SpanPositionRangeQuery.cs      |   4 -
 src/Lucene.Net/Search/Spans/SpanQuery.cs        |   4 -
 src/Lucene.Net/Search/Spans/SpanScorer.cs       |   5 -
 src/Lucene.Net/Search/Spans/SpanTermQuery.cs    |   3 -
 src/Lucene.Net/Search/Spans/SpanWeight.cs       |   4 -
 src/Lucene.Net/Search/Spans/Spans.cs            |   4 -
 src/Lucene.Net/Search/Spans/TermSpans.cs        |   6 -
 src/Lucene.Net/Search/TermCollectingRewrite.cs  |   6 -
 src/Lucene.Net/Search/TermQuery.cs              |   3 -
 src/Lucene.Net/Search/TermRangeFilter.cs        |   5 -
 src/Lucene.Net/Search/TermRangeQuery.cs         |   4 +-
 src/Lucene.Net/Search/TermRangeTermsEnum.cs     |   4 -
 src/Lucene.Net/Search/TermScorer.cs             |   4 -
 src/Lucene.Net/Search/TermStatistics.cs         |   4 -
 src/Lucene.Net/Search/TimeLimitingCollector.cs  |   9 --
 src/Lucene.Net/Search/TopDocs.cs                |  12 --
 src/Lucene.Net/Search/TopDocsCollector.cs       |   3 -
 src/Lucene.Net/Search/TopFieldCollector.cs      |  43 -------
 src/Lucene.Net/Search/TopFieldDocs.cs           |   4 -
 src/Lucene.Net/Search/TopScoreDocCollector.cs   |  16 ---
 src/Lucene.Net/Search/TopTermsRewrite.cs        |  12 --
 src/Lucene.Net/Search/TotalHitCountCollector.cs |   6 +-
 src/Lucene.Net/Search/Weight.cs                 |   8 --
 src/Lucene.Net/Search/WildcardQuery.cs          |   3 -
 src/Lucene.Net/Store/BaseDirectory.cs           |   3 -
 src/Lucene.Net/Store/BufferedChecksum.cs        |   4 -
 .../Store/BufferedChecksumIndexInput.cs         |   3 -
 src/Lucene.Net/Store/BufferedIndexInput.cs      |   3 -
 src/Lucene.Net/Store/BufferedIndexOutput.cs     |   3 -
 src/Lucene.Net/Store/ByteArrayDataInput.cs      |   3 -
 src/Lucene.Net/Store/ByteArrayDataOutput.cs     |   3 -
 src/Lucene.Net/Store/ByteBufferIndexInput.cs    |   6 -
 src/Lucene.Net/Store/CheckSumIndexInput.cs      |   3 -
 src/Lucene.Net/Store/CompoundFileWriter.cs      |   9 --
 src/Lucene.Net/Store/DataInput.cs               |   3 -
 src/Lucene.Net/Store/DataOutput.cs              |   4 -
 src/Lucene.Net/Store/Directory.cs               |  12 --
 src/Lucene.Net/Store/FilterDirectory.cs         |   3 -
 src/Lucene.Net/Store/FlushInfo.cs               |   5 -
 src/Lucene.Net/Store/IOContext.cs               |   4 -
 src/Lucene.Net/Store/IndexInput.cs              |   3 -
 src/Lucene.Net/Store/IndexOutput.cs             |   3 -
 src/Lucene.Net/Store/InputStreamDataInput.cs    |   3 -
 src/Lucene.Net/Store/LockFactory.cs             |   5 -
 src/Lucene.Net/Store/MergeInfo.cs               |   5 -
 src/Lucene.Net/Store/NIOFSDirectory.cs          |   9 --
 src/Lucene.Net/Store/NoLockFactory.cs           |   8 --
 src/Lucene.Net/Store/RAMDirectory.cs            |   3 -
 src/Lucene.Net/Store/RAMFile.cs                 |   4 -
 src/Lucene.Net/Store/RAMInputStream.cs          |   4 -
 src/Lucene.Net/Store/RAMOutputStream.cs         |   3 -
 .../Store/RateLimitedDirectoryWrapper.cs        |   4 -
 .../Store/SingleInstanceLockFactory.cs          |   4 -
 src/Lucene.Net/Support/AtomicBoolean.cs         |   6 +-
 src/Lucene.Net/Support/AtomicInteger.cs         |   6 +-
 src/Lucene.Net/Support/AtomicLong.cs            |   6 +-
 src/Lucene.Net/Support/IO/Buffer.cs             |   3 -
 src/Lucene.Net/Support/IO/ByteBuffer.cs         |   3 -
 src/Lucene.Net/Support/IO/LongBuffer.cs         |   3 -
 src/Lucene.Net/Support/IdentityComparer.cs      |   9 +-
 src/Lucene.Net/Support/IdentityHashMap.cs       |   6 +-
 src/Lucene.Net/Support/IdentityHashSet.cs       |   6 +-
 src/Lucene.Net/Support/LinkedHashMap.cs         |   3 -
 src/Lucene.Net/Support/PriorityQueue.cs         |   3 -
 src/Lucene.Net/Util/AttributeImpl.cs            |   3 -
 src/Lucene.Net/Util/AttributeSource.cs          |   6 -
 src/Lucene.Net/Util/BytesRefArray.cs            |   3 -
 src/Lucene.Net/Util/CharsRef.cs                 |   3 -
 src/Lucene.Net/Util/DocIdBitSet.cs              |   4 -
 src/Lucene.Net/Util/IntsRef.cs                  |   3 -
 src/Lucene.Net/Util/LongBitSet.cs               |   3 -
 src/Lucene.Net/Util/LongsRef.cs                 |   3 -
 src/Lucene.Net/Util/OpenBitSet.cs               |   3 -
 src/Lucene.Net/Util/OpenBitSetDISI.cs           |   5 -
 src/Lucene.Net/Util/PriorityQueue.cs            |   3 -
 385 files changed, 49 insertions(+), 2438 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net.Misc/Document/LazyDocument.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Document/LazyDocument.cs b/src/Lucene.Net.Misc/Document/LazyDocument.cs
index 0f6a7a2..a8b54f0 100644
--- a/src/Lucene.Net.Misc/Document/LazyDocument.cs
+++ b/src/Lucene.Net.Misc/Document/LazyDocument.cs
@@ -30,9 +30,6 @@ namespace Lucene.Net.Documents
     ///  for it.  You must not use the returned Field instances
     ///  after the provided reader has been closed. </summary>
     /// <seealso cref="GetField(FieldInfo)"/>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class LazyDocument
     {
         private readonly IndexReader reader;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs b/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
index db9b8d1..1bebbef 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/BlockJoinComparatorSource.cs
@@ -37,9 +37,6 @@ namespace Lucene.Net.Index.Sorter
     /// </summary>
     // TODO: can/should we clean this thing up (e.g. return a proper sort value)
     // and move to the join/ module?
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class BlockJoinComparerSource : FieldComparerSource
     {
         internal readonly Filter parentsFilter;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net.Misc/Index/Sorter/EarlyTerminatingSortingCollector.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/EarlyTerminatingSortingCollector.cs b/src/Lucene.Net.Misc/Index/Sorter/EarlyTerminatingSortingCollector.cs
index 60d19d4..0c72c35 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/EarlyTerminatingSortingCollector.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/EarlyTerminatingSortingCollector.cs
@@ -56,9 +56,6 @@ namespace Lucene.Net.Index.Sorter
     /// @lucene.experimental
     /// </para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class EarlyTerminatingSortingCollector : ICollector
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
index 2187ea3..f14f71d 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/SortingAtomicReader.cs
@@ -43,9 +43,6 @@ namespace Lucene.Net.Index.Sorter
     /// </summary>
     public class SortingAtomicReader : FilterAtomicReader
     {
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingFields : FilterFields
         {
             private readonly Sorter.DocMap docMap;
@@ -72,9 +69,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingTerms : FilterTerms
         {
             private readonly Sorter.DocMap docMap;
@@ -98,9 +92,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingTermsEnum : FilterTermsEnum
         {
             private readonly Sorter.DocMap docMap; // pkg-protected to avoid synthetic accessor methods
@@ -200,9 +191,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingBinaryDocValues : BinaryDocValues
         {
             private readonly BinaryDocValues @in;
@@ -220,9 +208,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingNumericDocValues : NumericDocValues
         {
             private readonly NumericDocValues @in;
@@ -240,9 +225,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingBits : IBits
         {
             private readonly IBits @in;
@@ -265,9 +247,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingSortedDocValues : SortedDocValues
         {
             private readonly SortedDocValues @in;
@@ -308,9 +287,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortingSortedSetDocValues : SortedSetDocValues
         {
             private readonly SortedSetDocValues @in;
@@ -351,9 +327,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class SortingDocsEnum : FilterDocsEnum
         {
             private sealed class DocFreqSorter : TimSorter
@@ -549,9 +522,6 @@ namespace Lucene.Net.Index.Sorter
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class SortingDocsAndPositionsEnum : FilterDocsAndPositionsEnum
         {
             /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs b/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
index 773e804..24fa56f 100644
--- a/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
+++ b/src/Lucene.Net.Misc/Index/Sorter/SortingMergePolicy.cs
@@ -43,9 +43,6 @@ namespace Lucene.Net.Index.Sorter
     /// @lucene.experimental 
     /// </para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class SortingMergePolicy : MergePolicy
     {
 

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/Token.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/Token.cs b/src/Lucene.Net/Analysis/Token.cs
index 5f5a843..d913196 100644
--- a/src/Lucene.Net/Analysis/Token.cs
+++ b/src/Lucene.Net/Analysis/Token.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Analysis.TokenAttributes;
-using System;
 using System.Reflection;
 using Attribute = Lucene.Net.Util.Attribute;
 using AttributeSource = Lucene.Net.Util.AttributeSource;
@@ -117,9 +116,6 @@ namespace Lucene.Net.Analysis
     /// this method now only prints the term text, no additional information anymore.
     /// </para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class Token : CharTermAttribute, ITypeAttribute, IPositionIncrementAttribute, IFlagsAttribute, IOffsetAttribute, IPayloadAttribute, IPositionLengthAttribute
     {
         private int startOffset, endOffset;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/CharTermAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/CharTermAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/CharTermAttribute.cs
index c633bda..e1e73a9 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/CharTermAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/CharTermAttribute.cs
@@ -33,9 +33,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="ICharTermAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class CharTermAttribute : Attribute, ICharTermAttribute, ITermToBytesRefAttribute
 #if FEATURE_CLONEABLE
         , ICloneable

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/FlagsAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/FlagsAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/FlagsAttribute.cs
index 098e6f8..1f2f7b6 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/FlagsAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/FlagsAttribute.cs
@@ -24,9 +24,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="IFlagsAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class FlagsAttribute : Attribute, IFlagsAttribute
 #if FEATURE_CLONEABLE
         , ICloneable

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/KeywordAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/KeywordAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/KeywordAttribute.cs
index 86d9446..48db835 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/KeywordAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/KeywordAttribute.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Analysis.TokenAttributes
 {
     /*
@@ -24,9 +22,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="IKeywordAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class KeywordAttribute : Attribute, IKeywordAttribute
     {
         private bool keyword;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/OffsetAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/OffsetAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/OffsetAttribute.cs
index 361f72e..20185af 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/OffsetAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/OffsetAttribute.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Analysis.TokenAttributes
 {
     /*
@@ -24,9 +22,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="IOffsetAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class OffsetAttribute : Attribute, IOffsetAttribute
     {
         private int startOffset;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/PayloadAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/PayloadAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/PayloadAttribute.cs
index ccf0f4b..4ba1e5a 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/PayloadAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/PayloadAttribute.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Analysis.TokenAttributes
 {
     /*
@@ -25,9 +23,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="IPayloadAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class PayloadAttribute : Attribute, IPayloadAttribute
     {
         private BytesRef payload;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/PositionIncrementAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/PositionIncrementAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/PositionIncrementAttribute.cs
index fca2805..00a82ba 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/PositionIncrementAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/PositionIncrementAttribute.cs
@@ -24,9 +24,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="IPositionIncrementAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class PositionIncrementAttribute : Attribute, IPositionIncrementAttribute
     {
         private int positionIncrement = 1;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/PositionLengthAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/PositionLengthAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/PositionLengthAttribute.cs
index 5f880a9..de2896d 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/PositionLengthAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/PositionLengthAttribute.cs
@@ -24,9 +24,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="IPositionLengthAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class PositionLengthAttribute : Attribute, IPositionLengthAttribute
     {
         private int positionLength = 1;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Analysis/TokenAttributes/TypeAttribute.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Analysis/TokenAttributes/TypeAttribute.cs b/src/Lucene.Net/Analysis/TokenAttributes/TypeAttribute.cs
index 37e5ddb..86ebc5d 100644
--- a/src/Lucene.Net/Analysis/TokenAttributes/TypeAttribute.cs
+++ b/src/Lucene.Net/Analysis/TokenAttributes/TypeAttribute.cs
@@ -24,9 +24,6 @@ namespace Lucene.Net.Analysis.TokenAttributes
 
     /// <summary>
     /// Default implementation of <see cref="ITypeAttribute"/>. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public partial class TypeAttribute : Attribute, ITypeAttribute
 #if FEATURE_CLONEABLE
         , ICloneable

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/BinaryDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/BinaryDocValuesField.cs b/src/Lucene.Net/Document/BinaryDocValuesField.cs
index cacc1b9..3cf44ee 100644
--- a/src/Lucene.Net/Document/BinaryDocValuesField.cs
+++ b/src/Lucene.Net/Document/BinaryDocValuesField.cs
@@ -1,6 +1,5 @@
 using Lucene.Net.Index;
 using Lucene.Net.Util;
-using System;
 
 namespace Lucene.Net.Documents
 {
@@ -37,9 +36,6 @@ namespace Lucene.Net.Documents
     /// separate <see cref="StoredField"/> instance.
     /// </summary>
     /// <seealso cref="BinaryDocValues"/>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class BinaryDocValuesField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/ByteDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/ByteDocValuesField.cs b/src/Lucene.Net/Document/ByteDocValuesField.cs
index cb3b7c9..38bfe8d 100644
--- a/src/Lucene.Net/Document/ByteDocValuesField.cs
+++ b/src/Lucene.Net/Document/ByteDocValuesField.cs
@@ -33,9 +33,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="NumericDocValuesField"/>
     [Obsolete("Use NumericDocValuesField instead")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class ByteDocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/DerefBytesDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/DerefBytesDocValuesField.cs b/src/Lucene.Net/Document/DerefBytesDocValuesField.cs
index 2d72760..4032ce9 100644
--- a/src/Lucene.Net/Document/DerefBytesDocValuesField.cs
+++ b/src/Lucene.Net/Document/DerefBytesDocValuesField.cs
@@ -34,9 +34,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="Index.BinaryDocValues"/>
     [Obsolete("Use BinaryDocValuesField instead.")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class DerefBytesDocValuesField : BinaryDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/Document.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/Document.cs b/src/Lucene.Net/Document/Document.cs
index e67946f..2711b54 100644
--- a/src/Lucene.Net/Document/Document.cs
+++ b/src/Lucene.Net/Document/Document.cs
@@ -37,9 +37,6 @@ namespace Lucene.Net.Documents
     /// <i>not</i> available in documents retrieved from the index, e.g. with 
     /// <see cref="Search.ScoreDoc.Doc"/> or <see cref="IndexReader.Document(int)"/>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class Document : IEnumerable<IIndexableField>
     {
         private readonly List<IIndexableField> fields = new List<IIndexableField>();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/DocumentStoredFieldVisitor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/DocumentStoredFieldVisitor.cs b/src/Lucene.Net/Document/DocumentStoredFieldVisitor.cs
index 490035e..3755784 100644
--- a/src/Lucene.Net/Document/DocumentStoredFieldVisitor.cs
+++ b/src/Lucene.Net/Document/DocumentStoredFieldVisitor.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Index;
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Documents
@@ -31,9 +30,6 @@ namespace Lucene.Net.Documents
     ///
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class DocumentStoredFieldVisitor : StoredFieldVisitor
     {
         private readonly Documents.Document doc = new Documents.Document();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/DoubleDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/DoubleDocValuesField.cs b/src/Lucene.Net/Document/DoubleDocValuesField.cs
index caf1f97..53f8abb 100644
--- a/src/Lucene.Net/Document/DoubleDocValuesField.cs
+++ b/src/Lucene.Net/Document/DoubleDocValuesField.cs
@@ -30,9 +30,6 @@ namespace Lucene.Net.Documents
     /// requiring eight bytes per document. Consider encoding double
     /// values yourself with only as much precision as you require.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class DoubleDocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/DoubleField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/DoubleField.cs b/src/Lucene.Net/Document/DoubleField.cs
index c7b7400..e3b7fd8 100644
--- a/src/Lucene.Net/Document/DoubleField.cs
+++ b/src/Lucene.Net/Document/DoubleField.cs
@@ -108,9 +108,6 @@ namespace Lucene.Net.Documents
     ///
     /// @since 2.9
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class DoubleField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/Field.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/Field.cs b/src/Lucene.Net/Document/Field.cs
index bff1d9a..4c10918 100644
--- a/src/Lucene.Net/Document/Field.cs
+++ b/src/Lucene.Net/Document/Field.cs
@@ -47,9 +47,6 @@ namespace Lucene.Net.Documents
     /// Field it is used in.  It is strongly recommended that no
     /// changes be made after <see cref="Field"/> instantiation.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public partial class Field : IIndexableField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/FieldType.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/FieldType.cs b/src/Lucene.Net/Document/FieldType.cs
index 3cb96a3..4211e7d 100644
--- a/src/Lucene.Net/Document/FieldType.cs
+++ b/src/Lucene.Net/Document/FieldType.cs
@@ -25,9 +25,6 @@ namespace Lucene.Net.Documents
     /// <summary>
     /// Describes the properties of a field.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class FieldType : IIndexableFieldType
     {
         // LUCENENET specific: Moved the NumericType enum outside of this class

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/FloatDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/FloatDocValuesField.cs b/src/Lucene.Net/Document/FloatDocValuesField.cs
index 0081398..eea5331 100644
--- a/src/Lucene.Net/Document/FloatDocValuesField.cs
+++ b/src/Lucene.Net/Document/FloatDocValuesField.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Documents
 {
     /*
@@ -34,9 +32,6 @@ namespace Lucene.Net.Documents
     /// NOTE: This was FloatDocValuesField in Lucene
     /// </para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SingleDocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/FloatField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/FloatField.cs b/src/Lucene.Net/Document/FloatField.cs
index c6cefe5..a0b59ca 100644
--- a/src/Lucene.Net/Document/FloatField.cs
+++ b/src/Lucene.Net/Document/FloatField.cs
@@ -112,9 +112,6 @@ namespace Lucene.Net.Documents
     /// </para>
     /// @since 2.9
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class SingleField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/IntDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/IntDocValuesField.cs b/src/Lucene.Net/Document/IntDocValuesField.cs
index d2e2f08..73b1e9a 100644
--- a/src/Lucene.Net/Document/IntDocValuesField.cs
+++ b/src/Lucene.Net/Document/IntDocValuesField.cs
@@ -34,9 +34,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="NumericDocValuesField"/>
     [Obsolete("Deprecated, use NumericDocValuesField instead")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class Int32DocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/IntField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/IntField.cs b/src/Lucene.Net/Document/IntField.cs
index 485e6e9..cf11b1c 100644
--- a/src/Lucene.Net/Document/IntField.cs
+++ b/src/Lucene.Net/Document/IntField.cs
@@ -111,9 +111,6 @@ namespace Lucene.Net.Documents
     /// </para>
     /// @since 2.9
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class Int32Field : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/LongDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/LongDocValuesField.cs b/src/Lucene.Net/Document/LongDocValuesField.cs
index fda5495..e09175c 100644
--- a/src/Lucene.Net/Document/LongDocValuesField.cs
+++ b/src/Lucene.Net/Document/LongDocValuesField.cs
@@ -37,9 +37,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="NumericDocValuesField"/>
     [Obsolete("Use NumericDocValuesField instead")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class Int64DocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/LongField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/LongField.cs b/src/Lucene.Net/Document/LongField.cs
index a93f018..8d1a36a 100644
--- a/src/Lucene.Net/Document/LongField.cs
+++ b/src/Lucene.Net/Document/LongField.cs
@@ -122,9 +122,6 @@ namespace Lucene.Net.Documents
     /// </para>
     /// @since 2.9
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class Int64Field : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/NumericDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/NumericDocValuesField.cs b/src/Lucene.Net/Document/NumericDocValuesField.cs
index 1c4bcb1..3d3893f 100644
--- a/src/Lucene.Net/Document/NumericDocValuesField.cs
+++ b/src/Lucene.Net/Document/NumericDocValuesField.cs
@@ -31,9 +31,6 @@ namespace Lucene.Net.Documents
     /// If you also need to store the value, you should add a
     /// separate <see cref="StoredField"/> instance.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class NumericDocValuesField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/PackedLongDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/PackedLongDocValuesField.cs b/src/Lucene.Net/Document/PackedLongDocValuesField.cs
index 5bae738..2012f4a 100644
--- a/src/Lucene.Net/Document/PackedLongDocValuesField.cs
+++ b/src/Lucene.Net/Document/PackedLongDocValuesField.cs
@@ -39,9 +39,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="NumericDocValuesField"/>
     [Obsolete("Use NumericDocValuesField instead.")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class PackedInt64DocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/ShortDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/ShortDocValuesField.cs b/src/Lucene.Net/Document/ShortDocValuesField.cs
index 972887f..5b140cf 100644
--- a/src/Lucene.Net/Document/ShortDocValuesField.cs
+++ b/src/Lucene.Net/Document/ShortDocValuesField.cs
@@ -39,9 +39,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="NumericDocValuesField"/>
     [Obsolete("Use NumericDocValuesField instead.")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class Int16DocValuesField : NumericDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/SortedBytesDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/SortedBytesDocValuesField.cs b/src/Lucene.Net/Document/SortedBytesDocValuesField.cs
index 96c08ce..2252ada 100644
--- a/src/Lucene.Net/Document/SortedBytesDocValuesField.cs
+++ b/src/Lucene.Net/Document/SortedBytesDocValuesField.cs
@@ -38,9 +38,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="SortedDocValuesField"/>
     [Obsolete("Use SortedDocValuesField instead.")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SortedBytesDocValuesField : SortedDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/SortedDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/SortedDocValuesField.cs b/src/Lucene.Net/Document/SortedDocValuesField.cs
index b67b53b..aa09528 100644
--- a/src/Lucene.Net/Document/SortedDocValuesField.cs
+++ b/src/Lucene.Net/Document/SortedDocValuesField.cs
@@ -1,6 +1,5 @@
 using Lucene.Net.Index;
 using Lucene.Net.Util;
-using System;
 
 namespace Lucene.Net.Documents
 {
@@ -35,9 +34,6 @@ namespace Lucene.Net.Documents
     /// If you also need to store the value, you should add a
     /// separate <see cref="StoredField"/> instance.</para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SortedDocValuesField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/SortedSetDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/SortedSetDocValuesField.cs b/src/Lucene.Net/Document/SortedSetDocValuesField.cs
index dfa46b4..77ef1b9 100644
--- a/src/Lucene.Net/Document/SortedSetDocValuesField.cs
+++ b/src/Lucene.Net/Document/SortedSetDocValuesField.cs
@@ -1,6 +1,5 @@
 using Lucene.Net.Index;
 using Lucene.Net.Util;
-using System;
 
 namespace Lucene.Net.Documents
 {
@@ -37,9 +36,6 @@ namespace Lucene.Net.Documents
     /// If you also need to store the value, you should add a
     /// separate <see cref="StoredField"/> instance.</para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SortedSetDocValuesField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/StoredField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/StoredField.cs b/src/Lucene.Net/Document/StoredField.cs
index f1609ab..b36e65d 100644
--- a/src/Lucene.Net/Document/StoredField.cs
+++ b/src/Lucene.Net/Document/StoredField.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Util;
-using System;
 
 namespace Lucene.Net.Documents
 {
@@ -25,9 +24,6 @@ namespace Lucene.Net.Documents
     /// <see cref="Search.IndexSearcher.Doc(int)"/> and <see cref="Index.IndexReader.Document(int)"/> will
     /// return the field and its value.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class StoredField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/StraightBytesDocValuesField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/StraightBytesDocValuesField.cs b/src/Lucene.Net/Document/StraightBytesDocValuesField.cs
index b4706da..a1db114 100644
--- a/src/Lucene.Net/Document/StraightBytesDocValuesField.cs
+++ b/src/Lucene.Net/Document/StraightBytesDocValuesField.cs
@@ -36,9 +36,6 @@ namespace Lucene.Net.Documents
     /// </summary>
     /// <seealso cref="BinaryDocValuesField"/>
     [Obsolete("Use BinaryDocValuesField instead.")]
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class StraightBytesDocValuesField : BinaryDocValuesField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/StringField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/StringField.cs b/src/Lucene.Net/Document/StringField.cs
index b59e68e..aa08213 100644
--- a/src/Lucene.Net/Document/StringField.cs
+++ b/src/Lucene.Net/Document/StringField.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Index;
-using System;
 
 namespace Lucene.Net.Documents
 {
@@ -27,9 +26,6 @@ namespace Lucene.Net.Documents
     /// field, or any field that you intend to use for sorting
     /// or access through the field cache.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class StringField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Document/TextField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Document/TextField.cs b/src/Lucene.Net/Document/TextField.cs
index 1fb435a..5f94331 100644
--- a/src/Lucene.Net/Document/TextField.cs
+++ b/src/Lucene.Net/Document/TextField.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Analysis;
-using System;
 using System.IO;
 
 namespace Lucene.Net.Documents
@@ -26,9 +25,6 @@ namespace Lucene.Net.Documents
     /// vectors.  For example this would be used on a 'body'
     /// field, that contains the bulk of a document's text.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class TextField : Field
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/AtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/AtomicReader.cs b/src/Lucene.Net/Index/AtomicReader.cs
index b228453..3e4f1eb 100644
--- a/src/Lucene.Net/Index/AtomicReader.cs
+++ b/src/Lucene.Net/Index/AtomicReader.cs
@@ -46,9 +46,6 @@ namespace Lucene.Net.Index
     /// <see cref="IndexReader"/> instance; use your own
     /// (non-Lucene) objects instead.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class AtomicReader : IndexReader
     {
         private void InitializeInstanceFields()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/AtomicReaderContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/AtomicReaderContext.cs b/src/Lucene.Net/Index/AtomicReaderContext.cs
index fd3a0d2..5551c6d 100644
--- a/src/Lucene.Net/Index/AtomicReaderContext.cs
+++ b/src/Lucene.Net/Index/AtomicReaderContext.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -24,9 +23,6 @@ namespace Lucene.Net.Index
     /// <summary>
     /// <see cref="IndexReaderContext"/> for <see cref="Index.AtomicReader"/> instances.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class AtomicReaderContext : IndexReaderContext
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/AutomatonTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/AutomatonTermsEnum.cs b/src/Lucene.Net/Index/AutomatonTermsEnum.cs
index e60a975..b505e86 100644
--- a/src/Lucene.Net/Index/AutomatonTermsEnum.cs
+++ b/src/Lucene.Net/Index/AutomatonTermsEnum.cs
@@ -45,9 +45,6 @@ namespace Lucene.Net.Index
     /// </para>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class AutomatonTermsEnum : FilteredTermsEnum
     {
         // a tableized array-based form of the DFA

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BaseCompositeReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BaseCompositeReader.cs b/src/Lucene.Net/Index/BaseCompositeReader.cs
index b175cc5..90da6c8 100644
--- a/src/Lucene.Net/Index/BaseCompositeReader.cs
+++ b/src/Lucene.Net/Index/BaseCompositeReader.cs
@@ -47,9 +47,6 @@ namespace Lucene.Net.Index
     /// @lucene.internal
     /// </summary>
     /// <seealso cref="MultiReader"/>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class BaseCompositeReader<R> : CompositeReader
         where R : IndexReader
     {

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BinaryDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BinaryDocValues.cs b/src/Lucene.Net/Index/BinaryDocValues.cs
index 0f48b4b..196ab7e 100644
--- a/src/Lucene.Net/Index/BinaryDocValues.cs
+++ b/src/Lucene.Net/Index/BinaryDocValues.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -24,9 +22,6 @@ namespace Lucene.Net.Index
     /// <summary>
     /// A per-document <see cref="T:byte[]"/>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class BinaryDocValues
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BinaryDocValuesFieldUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BinaryDocValuesFieldUpdates.cs b/src/Lucene.Net/Index/BinaryDocValuesFieldUpdates.cs
index c53f9c5..43357b0 100644
--- a/src/Lucene.Net/Index/BinaryDocValuesFieldUpdates.cs
+++ b/src/Lucene.Net/Index/BinaryDocValuesFieldUpdates.cs
@@ -36,14 +36,8 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class BinaryDocValuesFieldUpdates : DocValuesFieldUpdates
     {
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         new internal sealed class Iterator : DocValuesFieldUpdates.Iterator
         {
             private readonly PagedGrowableWriter offsets;
@@ -191,9 +185,6 @@ namespace Lucene.Net.Index
             return new Iterator(size, offsets, lengths, docs, values, docsWithField);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class InPlaceMergeSorterAnonymousInnerClassHelper : InPlaceMergeSorter
         {
             private readonly BinaryDocValuesFieldUpdates outerInstance;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BinaryDocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BinaryDocValuesWriter.cs b/src/Lucene.Net/Index/BinaryDocValuesWriter.cs
index bc86650..19c783e 100644
--- a/src/Lucene.Net/Index/BinaryDocValuesWriter.cs
+++ b/src/Lucene.Net/Index/BinaryDocValuesWriter.cs
@@ -36,9 +36,6 @@ namespace Lucene.Net.Index
     /// Buffers up pending <see cref="T:byte[]"/> per doc, then flushes when
     /// segment flushes.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class BinaryDocValuesWriter : DocValuesWriter
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BitsSlice.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BitsSlice.cs b/src/Lucene.Net/Index/BitsSlice.cs
index 3875e24..91c8b24 100644
--- a/src/Lucene.Net/Index/BitsSlice.cs
+++ b/src/Lucene.Net/Index/BitsSlice.cs
@@ -27,9 +27,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.internal
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class BitsSlice : IBits
     {
         private readonly IBits parent;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BufferedUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BufferedUpdates.cs b/src/Lucene.Net/Index/BufferedUpdates.cs
index cc4cdb5..cdc5ff4 100644
--- a/src/Lucene.Net/Index/BufferedUpdates.cs
+++ b/src/Lucene.Net/Index/BufferedUpdates.cs
@@ -39,9 +39,6 @@ namespace Lucene.Net.Index
     /// instance on <see cref="DocumentsWriterPerThread"/>, or via sync'd code by
     /// <see cref="DocumentsWriterDeleteQueue"/>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class BufferedUpdates // LUCENENET NOTE: Made public rather than internal because it is available through a public API
     {
         /* Rough logic: HashMap has an array[Entry] w/ varying

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/BufferedUpdatesStream.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/BufferedUpdatesStream.cs b/src/Lucene.Net/Index/BufferedUpdatesStream.cs
index 05f0161..ffce501 100644
--- a/src/Lucene.Net/Index/BufferedUpdatesStream.cs
+++ b/src/Lucene.Net/Index/BufferedUpdatesStream.cs
@@ -46,9 +46,6 @@ namespace Lucene.Net.Index
     /// track which BufferedDeletes packets to apply to any given
     /// segment.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class BufferedUpdatesStream
     {
         // TODO: maybe linked list?
@@ -129,9 +126,6 @@ namespace Lucene.Net.Index
             get { return bytesUsed.Get(); }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class ApplyDeletesResult
         {
             // True if any actual deletes took place:
@@ -154,9 +148,6 @@ namespace Lucene.Net.Index
         // Sorts SegmentInfos from smallest to biggest bufferedDelGen:
         private static readonly IComparer<SegmentCommitInfo> sortSegInfoByDelGen = new ComparerAnonymousInnerClassHelper();
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class ComparerAnonymousInnerClassHelper : IComparer<SegmentCommitInfo>
         {
             public ComparerAnonymousInnerClassHelper()
@@ -645,9 +636,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class QueryAndLimit
         {
             public Query Query { get; private set; }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ByteSliceReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ByteSliceReader.cs b/src/Lucene.Net/Index/ByteSliceReader.cs
index d7791b8..47061ec 100644
--- a/src/Lucene.Net/Index/ByteSliceReader.cs
+++ b/src/Lucene.Net/Index/ByteSliceReader.cs
@@ -31,9 +31,6 @@ namespace Lucene.Net.Index
     /// point we read the forwarding address of the next slice
     /// and then jump to it.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class ByteSliceReader : DataInput // LUCENENET specific - changed from internal to public because returned from public API
     {
         private ByteBlockPool pool;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ByteSliceWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ByteSliceWriter.cs b/src/Lucene.Net/Index/ByteSliceWriter.cs
index 43ed39c..f9fe770 100644
--- a/src/Lucene.Net/Index/ByteSliceWriter.cs
+++ b/src/Lucene.Net/Index/ByteSliceWriter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 
 namespace Lucene.Net.Index
@@ -28,9 +27,6 @@ namespace Lucene.Net.Index
     /// <see cref="T:byte[]"/>.  This is used by <see cref="DocumentsWriter"/> to hold the
     /// posting list for many terms in RAM.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class ByteSliceWriter : DataOutput
     {
         private byte[] slice;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/CheckIndex.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/CheckIndex.cs b/src/Lucene.Net/Index/CheckIndex.cs
index 565b312..30e97d8 100644
--- a/src/Lucene.Net/Index/CheckIndex.cs
+++ b/src/Lucene.Net/Index/CheckIndex.cs
@@ -58,9 +58,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class CheckIndex
     {
         private TextWriter infoStream;
@@ -71,9 +68,6 @@ namespace Lucene.Net.Index
         /// <para/>
         /// @lucene.experimental
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class Status
         {
             internal Status()
@@ -164,9 +158,6 @@ namespace Lucene.Net.Index
             /// <para/>
             /// @lucene.experimental
             /// </summary>
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             public class SegmentInfoStatus
             {
                 internal SegmentInfoStatus()
@@ -273,9 +264,6 @@ namespace Lucene.Net.Index
             /// <summary>
             /// Status from testing field norms.
             /// </summary>
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             public sealed class FieldNormStatus
             {
                 internal FieldNormStatus()
@@ -297,9 +285,6 @@ namespace Lucene.Net.Index
             /// <summary>
             /// Status from testing term index.
             /// </summary>
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             public sealed class TermIndexStatus
             {
                 internal TermIndexStatus()
@@ -345,9 +330,6 @@ namespace Lucene.Net.Index
             /// <summary>
             /// Status from testing stored fields.
             /// </summary>
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             public sealed class StoredFieldStatus
             {
                 internal StoredFieldStatus()
@@ -374,9 +356,6 @@ namespace Lucene.Net.Index
             /// <summary>
             /// Status from testing stored fields.
             /// </summary>
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             public sealed class TermVectorStatus
             {
                 internal TermVectorStatus()
@@ -403,9 +382,6 @@ namespace Lucene.Net.Index
             /// <summary>
             /// Status from testing <see cref="DocValues"/>
             /// </summary>
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             public sealed class DocValuesStatus
             {
                 internal DocValuesStatus()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/CoalescedUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/CoalescedUpdates.cs b/src/Lucene.Net/Index/CoalescedUpdates.cs
index 1892213..5ce47a9 100644
--- a/src/Lucene.Net/Index/CoalescedUpdates.cs
+++ b/src/Lucene.Net/Index/CoalescedUpdates.cs
@@ -28,9 +28,6 @@ namespace Lucene.Net.Index
     using Query = Lucene.Net.Search.Query;
     using QueryAndLimit = Lucene.Net.Index.BufferedUpdatesStream.QueryAndLimit;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class CoalescedUpdates
     {
         internal readonly IDictionary<Query, int> queries = new Dictionary<Query, int>();
@@ -74,9 +71,6 @@ namespace Lucene.Net.Index
             return new IterableAnonymousInnerClassHelper(this);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class IterableAnonymousInnerClassHelper : IEnumerable<Term>
         {
             private readonly CoalescedUpdates outerInstance;
@@ -107,9 +101,6 @@ namespace Lucene.Net.Index
             return new IterableAnonymousInnerClassHelper2(this);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class IterableAnonymousInnerClassHelper2 : IEnumerable<QueryAndLimit>
         {
             private readonly CoalescedUpdates outerInstance;
@@ -129,9 +120,6 @@ namespace Lucene.Net.Index
                 return GetEnumerator();
             }
 
-#if FEATURE_SERIALIZABLE
-            [Serializable]
-#endif
             private class IteratorAnonymousInnerClassHelper : IEnumerator<QueryAndLimit>
             {
                 private readonly IterableAnonymousInnerClassHelper2 outerInstance;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/CompositeReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/CompositeReader.cs b/src/Lucene.Net/Index/CompositeReader.cs
index bd5ea20..de5ef2c 100644
--- a/src/Lucene.Net/Index/CompositeReader.cs
+++ b/src/Lucene.Net/Index/CompositeReader.cs
@@ -55,9 +55,6 @@ namespace Lucene.Net.Index
     /// <see cref="IndexReader"/> instance; use your own
     /// (non-Lucene) objects instead.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class CompositeReader : IndexReader
     {
         private volatile CompositeReaderContext readerContext = null; // lazy init

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/CompositeReaderContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/CompositeReaderContext.cs b/src/Lucene.Net/Index/CompositeReaderContext.cs
index 76c17e2..846f213 100644
--- a/src/Lucene.Net/Index/CompositeReaderContext.cs
+++ b/src/Lucene.Net/Index/CompositeReaderContext.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -25,9 +24,6 @@ namespace Lucene.Net.Index
     /// <summary>
     /// <see cref="IndexReaderContext"/> for <see cref="CompositeReader"/> instance.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class CompositeReaderContext : IndexReaderContext
     {
         private readonly IList<IndexReaderContext> children;
@@ -87,9 +83,6 @@ namespace Lucene.Net.Index
             get { return reader; }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public sealed class Builder
         {
             private readonly CompositeReader reader;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
index 04467f4..9d3255e 100644
--- a/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
+++ b/src/Lucene.Net/Index/ConcurrentMergeScheduler.cs
@@ -44,9 +44,6 @@ namespace Lucene.Net.Index
     /// incoming threads by pausing until one more more merges
     /// complete.</para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class ConcurrentMergeScheduler : MergeScheduler, IConcurrentMergeScheduler
     {
         private int mergeThreadPriority = -1;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DirectoryReader.cs b/src/Lucene.Net/Index/DirectoryReader.cs
index 7056ce0..ef1cac1 100644
--- a/src/Lucene.Net/Index/DirectoryReader.cs
+++ b/src/Lucene.Net/Index/DirectoryReader.cs
@@ -46,9 +46,6 @@ namespace Lucene.Net.Index
     /// <see cref="IndexReader"/> instance; use your own
     /// (non-Lucene) objects instead.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class DirectoryReader : BaseCompositeReader<AtomicReader>
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocConsumer.cs b/src/Lucene.Net/Index/DocConsumer.cs
index 6801018..c764fce 100644
--- a/src/Lucene.Net/Index/DocConsumer.cs
+++ b/src/Lucene.Net/Index/DocConsumer.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -18,9 +16,7 @@ namespace Lucene.Net.Index
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal abstract class DocConsumer
     {
         public abstract void ProcessDocument(FieldInfos.Builder fieldInfos);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocFieldConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocFieldConsumer.cs b/src/Lucene.Net/Index/DocFieldConsumer.cs
index 283704b..909d1e6 100644
--- a/src/Lucene.Net/Index/DocFieldConsumer.cs
+++ b/src/Lucene.Net/Index/DocFieldConsumer.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -19,9 +18,7 @@ namespace Lucene.Net.Index
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal abstract class DocFieldConsumer
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocFieldConsumerPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocFieldConsumerPerField.cs b/src/Lucene.Net/Index/DocFieldConsumerPerField.cs
index 9cd1bf0..1e63a0c 100644
--- a/src/Lucene.Net/Index/DocFieldConsumerPerField.cs
+++ b/src/Lucene.Net/Index/DocFieldConsumerPerField.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -18,9 +16,7 @@ namespace Lucene.Net.Index
      * See the License for the specific language governing permissions and
      * limitations under the License.
      */
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal abstract class DocFieldConsumerPerField
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocFieldProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocFieldProcessor.cs b/src/Lucene.Net/Index/DocFieldProcessor.cs
index e0a412f..3951ff4 100644
--- a/src/Lucene.Net/Index/DocFieldProcessor.cs
+++ b/src/Lucene.Net/Index/DocFieldProcessor.cs
@@ -35,9 +35,7 @@ namespace Lucene.Net.Index
     /// of its own: it just forwards the fields to a
     /// <see cref="DocFieldConsumer"/>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal sealed class DocFieldProcessor : DocConsumer
     {
         internal readonly DocFieldConsumer consumer;
@@ -284,9 +282,6 @@ namespace Lucene.Net.Index
 
         private static readonly IComparer<DocFieldProcessorPerField> fieldsComp = new ComparerAnonymousInnerClassHelper();
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class ComparerAnonymousInnerClassHelper : IComparer<DocFieldProcessorPerField>
         {
             public ComparerAnonymousInnerClassHelper()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocFieldProcessorPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocFieldProcessorPerField.cs b/src/Lucene.Net/Index/DocFieldProcessorPerField.cs
index b962dcb..94a5d24 100644
--- a/src/Lucene.Net/Index/DocFieldProcessorPerField.cs
+++ b/src/Lucene.Net/Index/DocFieldProcessorPerField.cs
@@ -25,9 +25,7 @@ namespace Lucene.Net.Index
     /// <summary>
     /// Holds all per thread, per field state.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal sealed class DocFieldProcessorPerField
     {
         internal readonly DocFieldConsumerPerField consumer;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocInverter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocInverter.cs b/src/Lucene.Net/Index/DocInverter.cs
index e03a117..fe5eec4 100644
--- a/src/Lucene.Net/Index/DocInverter.cs
+++ b/src/Lucene.Net/Index/DocInverter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -25,9 +24,6 @@ namespace Lucene.Net.Index
     /// separately, from a <see cref="Documents.Document"/>, and accepts a
     /// <see cref="InvertedDocConsumer"/> to process those terms.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocInverter : DocFieldConsumer
     {
         internal readonly InvertedDocConsumer consumer;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocInverterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocInverterPerField.cs b/src/Lucene.Net/Index/DocInverterPerField.cs
index d9bb0c4..b9372a8 100644
--- a/src/Lucene.Net/Index/DocInverterPerField.cs
+++ b/src/Lucene.Net/Index/DocInverterPerField.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Analysis.TokenAttributes;
-using System;
 
 namespace Lucene.Net.Index
 {
@@ -31,9 +30,6 @@ namespace Lucene.Net.Index
     /// (<see cref="InvertedDocConsumerPerField"/>).  It also interacts with an
     /// endConsumer (<see cref="InvertedDocEndConsumerPerField"/>).
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocInverterPerField : DocFieldConsumerPerField
     {
         internal readonly FieldInfo fieldInfo;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocTermOrds.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocTermOrds.cs b/src/Lucene.Net/Index/DocTermOrds.cs
index 237e3fc..424e6b7 100644
--- a/src/Lucene.Net/Index/DocTermOrds.cs
+++ b/src/Lucene.Net/Index/DocTermOrds.cs
@@ -106,9 +106,6 @@ namespace Lucene.Net.Index
     ///     </description></item>
     /// </list>
     /// </remarks>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class DocTermOrds
     {
         /// <summary>
@@ -740,9 +737,6 @@ namespace Lucene.Net.Index
         /// <see cref="TermsEnum.Ord"/>; in this case we "wrap" our own terms index
         /// around it.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class OrdWrappedTermsEnum : TermsEnum
         {
             internal void InitializeInstanceFields()
@@ -959,9 +953,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class Iterator : SortedSetDocValues
         {
             private readonly DocTermOrds outerInstance;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocValues.cs b/src/Lucene.Net/Index/DocValues.cs
index 2cf3502..1d598ce 100644
--- a/src/Lucene.Net/Index/DocValues.cs
+++ b/src/Lucene.Net/Index/DocValues.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -25,9 +23,6 @@ namespace Lucene.Net.Index
     /// <summary>
     /// This class contains utility methods and constants for <see cref="DocValues"/>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class DocValues
     {
         /* no instantiation */
@@ -41,9 +36,6 @@ namespace Lucene.Net.Index
         /// </summary>
         public static readonly BinaryDocValues EMPTY_BINARY = new BinaryDocValuesAnonymousInnerClassHelper();
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class BinaryDocValuesAnonymousInnerClassHelper : BinaryDocValues
         {
             public BinaryDocValuesAnonymousInnerClassHelper()
@@ -63,9 +55,6 @@ namespace Lucene.Net.Index
         /// </summary>
         public static readonly NumericDocValues EMPTY_NUMERIC = new NumericDocValuesAnonymousInnerClassHelper();
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class NumericDocValuesAnonymousInnerClassHelper : NumericDocValues
         {
             public NumericDocValuesAnonymousInnerClassHelper()
@@ -83,9 +72,6 @@ namespace Lucene.Net.Index
         /// </summary>
         public static readonly SortedDocValues EMPTY_SORTED = new SortedDocValuesAnonymousInnerClassHelper();
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class SortedDocValuesAnonymousInnerClassHelper : SortedDocValues
         {
             public SortedDocValuesAnonymousInnerClassHelper()
@@ -118,9 +104,6 @@ namespace Lucene.Net.Index
         /// </summary>
         public static readonly SortedSetDocValues EMPTY_SORTED_SET = new RandomAccessOrdsAnonymousInnerClassHelper();
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class RandomAccessOrdsAnonymousInnerClassHelper : RandomAccessOrds
         {
             public RandomAccessOrdsAnonymousInnerClassHelper()
@@ -192,9 +175,6 @@ namespace Lucene.Net.Index
             return new BitsAnonymousInnerClassHelper(dv, maxDoc);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class BitsAnonymousInnerClassHelper : IBits
         {
             private Lucene.Net.Index.SortedDocValues dv;
@@ -225,9 +205,6 @@ namespace Lucene.Net.Index
             return new BitsAnonymousInnerClassHelper2(dv, maxDoc);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class BitsAnonymousInnerClassHelper2 : IBits
         {
             private Lucene.Net.Index.SortedSetDocValues dv;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocValuesFieldUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocValuesFieldUpdates.cs b/src/Lucene.Net/Index/DocValuesFieldUpdates.cs
index a16158f..9f6c34b 100644
--- a/src/Lucene.Net/Index/DocValuesFieldUpdates.cs
+++ b/src/Lucene.Net/Index/DocValuesFieldUpdates.cs
@@ -1,6 +1,5 @@
 using Lucene.Net.Support;
 using System.Collections.Generic;
-using System;
 using System.Diagnostics;
 
 namespace Lucene.Net.Index
@@ -27,9 +26,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal abstract class DocValuesFieldUpdates
     {
         // LUCENENET specific: de-nested Type enum and renamed DocValuesFieldUpdatesType
@@ -39,9 +35,6 @@ namespace Lucene.Net.Index
         /// updates are returned by this iterator, and the documents are returned in
         /// increasing order.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public abstract class Iterator
         {
             /// <summary>
@@ -68,9 +61,6 @@ namespace Lucene.Net.Index
             public abstract void Reset();
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class Container
         {
             internal readonly IDictionary<string, NumericDocValuesFieldUpdates> numericDVUpdates = new Dictionary<string, NumericDocValuesFieldUpdates>();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocValuesProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocValuesProcessor.cs b/src/Lucene.Net/Index/DocValuesProcessor.cs
index 9d89b24..d8f80ff 100644
--- a/src/Lucene.Net/Index/DocValuesProcessor.cs
+++ b/src/Lucene.Net/Index/DocValuesProcessor.cs
@@ -28,9 +28,6 @@ namespace Lucene.Net.Index
     using DocValuesFormat = Lucene.Net.Codecs.DocValuesFormat;
     using IOUtils = Lucene.Net.Util.IOUtils;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocValuesProcessor : StoredFieldsConsumer
     {
         // TODO: somewhat wasteful we also keep a map here; would

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocValuesUpdate.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocValuesUpdate.cs b/src/Lucene.Net/Index/DocValuesUpdate.cs
index c6f562b..bd2494a 100644
--- a/src/Lucene.Net/Index/DocValuesUpdate.cs
+++ b/src/Lucene.Net/Index/DocValuesUpdate.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Documents;
-using System;
 
 namespace Lucene.Net.Index
 {
@@ -26,9 +25,6 @@ namespace Lucene.Net.Index
 
     /// <summary>
     /// An in-place update to a <see cref="DocValues"/> field. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class DocValuesUpdate
     {
         /* Rough logic: OBJ_HEADER + 3*PTR + INT
@@ -80,9 +76,6 @@ namespace Lucene.Net.Index
 
         /// <summary>
         /// An in-place update to a binary <see cref="DocValues"/> field </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public sealed class BinaryDocValuesUpdate : DocValuesUpdate
         {
             /* Size of BytesRef: 2*INT + ARRAY_HEADER + PTR */
@@ -103,9 +96,6 @@ namespace Lucene.Net.Index
 
         /// <summary>
         /// An in-place update to a numeric <see cref="DocValues"/> field </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public sealed class NumericDocValuesUpdate : DocValuesUpdate // LUCENENET NOTE: Made public rather than internal because it is on a public API
         {
             internal static readonly long? MISSING = new long?(0);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocValuesWriter.cs b/src/Lucene.Net/Index/DocValuesWriter.cs
index 85e9b0f..f995021 100644
--- a/src/Lucene.Net/Index/DocValuesWriter.cs
+++ b/src/Lucene.Net/Index/DocValuesWriter.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -21,9 +19,6 @@ namespace Lucene.Net.Index
 
     using DocValuesConsumer = Lucene.Net.Codecs.DocValuesConsumer;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal abstract class DocValuesWriter
     {
         public abstract void Abort();


Mime
View raw message