lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [12/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:30 GMT
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocsAndPositionsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocsAndPositionsEnum.cs b/src/Lucene.Net/Index/DocsAndPositionsEnum.cs
index 17fb5e4..c8e64f4 100644
--- a/src/Lucene.Net/Index/DocsAndPositionsEnum.cs
+++ b/src/Lucene.Net/Index/DocsAndPositionsEnum.cs
@@ -49,9 +49,6 @@ namespace Lucene.Net.Index
 
     /// <summary>
     /// Also iterates through positions. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class DocsAndPositionsEnum : DocsEnum
     {
         // LUCENENET specific - made flags into their own [Flags] enum named DocsAndPositionsFlags and de-nested from this type

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocsEnum.cs b/src/Lucene.Net/Index/DocsEnum.cs
index 32b022e..aec95d8 100644
--- a/src/Lucene.Net/Index/DocsEnum.cs
+++ b/src/Lucene.Net/Index/DocsEnum.cs
@@ -45,9 +45,6 @@ namespace Lucene.Net.Index
     /// NOTE: you must first call <see cref="DocIdSetIterator.NextDoc()"/> before using
     /// any of the per-doc methods.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class DocsEnum : DocIdSetIterator
     {
         // LUCENENET specific - made flags into their own [Flags] enum named DocsFlags and de-nested from this type

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriter.cs b/src/Lucene.Net/Index/DocumentsWriter.cs
index 3577487..fbecda3 100644
--- a/src/Lucene.Net/Index/DocumentsWriter.cs
+++ b/src/Lucene.Net/Index/DocumentsWriter.cs
@@ -100,9 +100,6 @@ namespace Lucene.Net.Index
     /// deleted so that the document is always atomically ("all
     /// or none") added to the index.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocumentsWriter : IDisposable
     {
         private readonly Directory directory;
@@ -831,9 +828,6 @@ namespace Lucene.Net.Index
             events.Enqueue(@event);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class ApplyDeletesEvent : IEvent
         {
             internal static readonly IEvent INSTANCE = new ApplyDeletesEvent();
@@ -851,9 +845,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class MergePendingEvent : IEvent
         {
             internal static readonly IEvent INSTANCE = new MergePendingEvent();
@@ -871,9 +862,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class ForcedPurgeEvent : IEvent
         {
             internal static readonly IEvent INSTANCE = new ForcedPurgeEvent();
@@ -891,9 +879,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class FlushFailedEvent : IEvent
         {
             private readonly SegmentInfo info;
@@ -909,9 +894,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class DeleteNewFilesEvent : IEvent
         {
             private readonly ICollection<string> files;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriterDeleteQueue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterDeleteQueue.cs b/src/Lucene.Net/Index/DocumentsWriterDeleteQueue.cs
index f035d65..588b80e 100644
--- a/src/Lucene.Net/Index/DocumentsWriterDeleteQueue.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterDeleteQueue.cs
@@ -67,9 +67,6 @@ namespace Lucene.Net.Index
     /// will also not be added to its private deletes neither to the global deletes.
     ///
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocumentsWriterDeleteQueue
     {
         private Node tail; // LUCENENET NOTE: can't use type without specifying type parameter, also not volatile due to Interlocked
@@ -287,9 +284,6 @@ namespace Lucene.Net.Index
             return false;
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class DeleteSlice
         {
             // No need to be volatile, slices are thread captive (only accessed by one thread)!
@@ -377,9 +371,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class Node // LUCENENET specific - made internal instead of private because it is used in internal APIs
         {
             internal /*volatile*/ Node next;
@@ -406,9 +397,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class TermNode : Node
         {
             internal TermNode(Term term)
@@ -427,9 +415,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class QueryArrayNode : Node
         {
             internal QueryArrayNode(Query[] query)
@@ -446,9 +431,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class TermArrayNode : Node
         {
             internal TermArrayNode(Term[] term)
@@ -470,9 +452,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class NumericUpdateNode : Node
         {
             internal NumericUpdateNode(NumericDocValuesUpdate update)
@@ -491,9 +470,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class BinaryUpdateNode : Node
         {
             internal BinaryUpdateNode(BinaryDocValuesUpdate update)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs b/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
index eb7d110..7044b9d 100644
--- a/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterFlushControl.cs
@@ -38,9 +38,6 @@ namespace Lucene.Net.Index
     /// <see cref="IndexWriterConfig.RAMPerThreadHardLimitMB"/> to prevent address
     /// space exhaustion.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocumentsWriterFlushControl
     {
         private readonly long hardMaxBytesPerDWPT;
@@ -503,9 +500,6 @@ namespace Lucene.Net.Index
             return new IteratorAnonymousInnerClassHelper(this, upto);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class IteratorAnonymousInnerClassHelper : IEnumerator<ThreadState>
         {
             private readonly DocumentsWriterFlushControl outerInstance;
@@ -909,9 +903,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class BlockedFlush
         {
             internal DocumentsWriterPerThread Dwpt { get; private set; }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriterFlushQueue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterFlushQueue.cs b/src/Lucene.Net/Index/DocumentsWriterFlushQueue.cs
index 9ef285a..068a549 100644
--- a/src/Lucene.Net/Index/DocumentsWriterFlushQueue.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterFlushQueue.cs
@@ -28,9 +28,6 @@ namespace Lucene.Net.Index
     /// <summary>
     /// @lucene.internal
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class DocumentsWriterFlushQueue
     {
         private readonly LinkedList<FlushTicket> queue = new LinkedList<FlushTicket>();
@@ -225,9 +222,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal abstract class FlushTicket
         {
             protected FrozenBufferedUpdates m_frozenUpdates;
@@ -290,9 +284,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class GlobalDeletesTicket : FlushTicket
         {
             internal GlobalDeletesTicket(FrozenBufferedUpdates frozenUpdates) // LUCENENET NOTE: Made internal rather than protected because class is sealed
@@ -314,9 +305,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class SegmentFlushTicket : FlushTicket
         {
             internal FlushedSegment segment;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
index 3fe6c9c..a517ccf 100644
--- a/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterPerThread.cs
@@ -42,9 +42,6 @@ namespace Lucene.Net.Index
     using Similarity = Lucene.Net.Search.Similarities.Similarity;
     using TrackingDirectoryWrapper = Lucene.Net.Store.TrackingDirectoryWrapper;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class DocumentsWriterPerThread
     {
         /// <summary>
@@ -52,9 +49,6 @@ namespace Lucene.Net.Index
         /// which returns the <see cref="DocConsumer"/> that the <see cref="DocumentsWriter"/> calls to process the
         /// documents.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal abstract class IndexingChain
         {
             internal abstract DocConsumer GetChain(DocumentsWriterPerThread documentsWriterPerThread);
@@ -67,9 +61,6 @@ namespace Lucene.Net.Index
             get { return defaultIndexingChain; }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class IndexingChainAnonymousInnerClassHelper : IndexingChain
         {
             public IndexingChainAnonymousInnerClassHelper()
@@ -115,9 +106,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class DocState
         {
             internal readonly DocumentsWriterPerThread docWriter;
@@ -149,9 +137,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class FlushedSegment
         {
             internal readonly SegmentCommitInfo segmentInfo;
@@ -727,9 +712,6 @@ namespace Lucene.Net.Index
         /// <summary>
         /// NOTE: This was IntBlockAllocator in Lucene
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class Int32BlockAllocator : Int32BlockPool.Allocator
         {
             private readonly Counter bytesUsed;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriterPerThreadPool.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterPerThreadPool.cs b/src/Lucene.Net/Index/DocumentsWriterPerThreadPool.cs
index 4c2dc81..396c9b1 100644
--- a/src/Lucene.Net/Index/DocumentsWriterPerThreadPool.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterPerThreadPool.cs
@@ -36,9 +36,6 @@ namespace Lucene.Net.Index
     /// is reusing the flushing <see cref="DocumentsWriterPerThread"/>s <see cref="ThreadState"/> with a
     /// new <see cref="DocumentsWriterPerThread"/> instance.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal abstract class DocumentsWriterPerThreadPool
     {
         /// <summary>
@@ -52,9 +49,6 @@ namespace Lucene.Net.Index
         /// and release the lock in a finally block via <see cref="ReentrantLock.Unlock()"/>
         /// (on the <see cref="ThreadState"/> instance) before accessing the state.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class ThreadState : ReentrantLock
         {
             internal DocumentsWriterPerThread dwpt;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/DocumentsWriterStallControl.cs b/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
index c2f5587..84eacc9 100644
--- a/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
+++ b/src/Lucene.Net/Index/DocumentsWriterStallControl.cs
@@ -39,9 +39,6 @@ namespace Lucene.Net.Index
     /// than the number of active <see cref="DocumentsWriterPerThreadPool.ThreadState"/>s threads are released and can
     /// continue indexing.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class DocumentsWriterStallControl
     {
         private volatile bool stalled;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FieldInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FieldInfo.cs b/src/Lucene.Net/Index/FieldInfo.cs
index 0d31307..3fdc793 100644
--- a/src/Lucene.Net/Index/FieldInfo.cs
+++ b/src/Lucene.Net/Index/FieldInfo.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -28,9 +27,7 @@ namespace Lucene.Net.Index
     ///  be adding documents at a time, with no other reader or writer threads
     ///  accessing this object.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class FieldInfo
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FieldInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FieldInfos.cs b/src/Lucene.Net/Index/FieldInfos.cs
index 072f67b..c267ae1 100644
--- a/src/Lucene.Net/Index/FieldInfos.cs
+++ b/src/Lucene.Net/Index/FieldInfos.cs
@@ -28,9 +28,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class FieldInfos : IEnumerable<FieldInfo>
     {
         private readonly bool hasFreq;
@@ -206,9 +203,6 @@ namespace Lucene.Net.Index
             return ret;
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class FieldNumbers
         {
             private readonly IDictionary<int?, string> numberToName;
@@ -345,9 +339,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class Builder
         {
             private readonly Dictionary<string, FieldInfo> byName = new Dictionary<string, FieldInfo>();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FieldInvertState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FieldInvertState.cs b/src/Lucene.Net/Index/FieldInvertState.cs
index 67a8825..744595a 100644
--- a/src/Lucene.Net/Index/FieldInvertState.cs
+++ b/src/Lucene.Net/Index/FieldInvertState.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class FieldInvertState
     {
         // LUCENENET specific - made fields private and added internal setters so they can be set

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/Fields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/Fields.cs b/src/Lucene.Net/Index/Fields.cs
index 1d54990..7dcac81 100644
--- a/src/Lucene.Net/Index/Fields.cs
+++ b/src/Lucene.Net/Index/Fields.cs
@@ -26,9 +26,7 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public abstract class Fields : IEnumerable<string>
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FilterAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FilterAtomicReader.cs b/src/Lucene.Net/Index/FilterAtomicReader.cs
index 9481437..bc93e7a 100644
--- a/src/Lucene.Net/Index/FilterAtomicReader.cs
+++ b/src/Lucene.Net/Index/FilterAtomicReader.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Text;
 
@@ -44,9 +43,6 @@ namespace Lucene.Net.Index
     /// overridden as well if the <see cref="LiveDocs"/> are not changed
     /// either.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class FilterAtomicReader : AtomicReader
     {
         /// <summary>
@@ -66,9 +62,6 @@ namespace Lucene.Net.Index
         /// Base class for filtering <see cref="Index.Fields"/>
         /// implementations.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class FilterFields : Fields
         {
             /// <summary>
@@ -105,9 +98,6 @@ namespace Lucene.Net.Index
         /// these terms are going to be intersected with automata, you could consider
         /// overriding <see cref="Terms.Intersect"/> for better performance.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class FilterTerms : Terms
         {
             /// <summary>
@@ -187,9 +177,6 @@ namespace Lucene.Net.Index
 
         /// <summary>
         /// Base class for filtering <see cref="TermsEnum"/> implementations. </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class FilterTermsEnum : TermsEnum
         {
             /// <summary>
@@ -265,9 +252,6 @@ namespace Lucene.Net.Index
 
         /// <summary>
         /// Base class for filtering <see cref="DocsEnum"/> implementations. </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class FilterDocsEnum : DocsEnum
         {
             /// <summary>
@@ -316,9 +300,6 @@ namespace Lucene.Net.Index
 
         /// <summary>
         /// Base class for filtering <see cref="DocsAndPositionsEnum"/> implementations. </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class FilterDocsAndPositionsEnum : DocsAndPositionsEnum
         {
             /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FilterDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FilterDirectoryReader.cs b/src/Lucene.Net/Index/FilterDirectoryReader.cs
index 85af88d..f53dd85 100644
--- a/src/Lucene.Net/Index/FilterDirectoryReader.cs
+++ b/src/Lucene.Net/Index/FilterDirectoryReader.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -32,9 +31,6 @@ namespace Lucene.Net.Index
     /// implement a <see cref="SubReaderWrapper"/> subclass, and pass an instance to its base
     /// constructor.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class FilterDirectoryReader : DirectoryReader
     {
         /// <summary>
@@ -43,9 +39,6 @@ namespace Lucene.Net.Index
         /// can use this to, e.g., wrap the subreaders with specialized
         /// <see cref="FilterAtomicReader"/> implementations.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public abstract class SubReaderWrapper
         {
             internal virtual AtomicReader[] Wrap(IList<AtomicReader> readers)
@@ -75,9 +68,6 @@ namespace Lucene.Net.Index
         /// A no-op <see cref="SubReaderWrapper"/> that simply returns the parent
         /// <see cref="DirectoryReader"/>'s original subreaders.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class StandardReaderWrapper : SubReaderWrapper
         {
             /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FilteredTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FilteredTermsEnum.cs b/src/Lucene.Net/Index/FilteredTermsEnum.cs
index a5dda64..4e3949e 100644
--- a/src/Lucene.Net/Index/FilteredTermsEnum.cs
+++ b/src/Lucene.Net/Index/FilteredTermsEnum.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -36,9 +35,6 @@ namespace Lucene.Net.Index
     /// <see cref="NotSupportedException"/> when a seeking method
     /// is called.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class FilteredTermsEnum : TermsEnum
     {
         private BytesRef initialSeekTerm = null;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FlushByRamOrCountsPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FlushByRamOrCountsPolicy.cs b/src/Lucene.Net/Index/FlushByRamOrCountsPolicy.cs
index 8c4da3c..ff181b6 100644
--- a/src/Lucene.Net/Index/FlushByRamOrCountsPolicy.cs
+++ b/src/Lucene.Net/Index/FlushByRamOrCountsPolicy.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -61,9 +59,6 @@ namespace Lucene.Net.Index
     /// pending iff the global active RAM consumption is &gt;= the configured max RAM
     /// buffer.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class FlushByRamOrCountsPolicy : FlushPolicy
     {
         public override void OnDelete(DocumentsWriterFlushControl control, ThreadState state)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FlushPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FlushPolicy.cs b/src/Lucene.Net/Index/FlushPolicy.cs
index 8eca198..3a44009 100644
--- a/src/Lucene.Net/Index/FlushPolicy.cs
+++ b/src/Lucene.Net/Index/FlushPolicy.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -52,9 +51,6 @@ namespace Lucene.Net.Index
     /// <seealso cref="DocumentsWriterFlushControl"/>
     /// <seealso cref="DocumentsWriterPerThread"/>
     /// <seealso cref="IndexWriterConfig.FlushPolicy"/>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal abstract class FlushPolicy
     {
         protected LiveIndexWriterConfig m_indexWriterConfig;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FreqProxTermsWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FreqProxTermsWriter.cs b/src/Lucene.Net/Index/FreqProxTermsWriter.cs
index f857c61..23590ae 100644
--- a/src/Lucene.Net/Index/FreqProxTermsWriter.cs
+++ b/src/Lucene.Net/Index/FreqProxTermsWriter.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -26,9 +25,6 @@ namespace Lucene.Net.Index
     using FieldsConsumer = Lucene.Net.Codecs.FieldsConsumer;
     using IOUtils = Lucene.Net.Util.IOUtils;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class FreqProxTermsWriter : TermsHashConsumer
     {
         public override void Abort()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FreqProxTermsWriterPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FreqProxTermsWriterPerField.cs b/src/Lucene.Net/Index/FreqProxTermsWriterPerField.cs
index 07fce0c..776c605 100644
--- a/src/Lucene.Net/Index/FreqProxTermsWriterPerField.cs
+++ b/src/Lucene.Net/Index/FreqProxTermsWriterPerField.cs
@@ -36,9 +36,6 @@ namespace Lucene.Net.Index
     // TODO: break into separate freq and prox writers as
     // codecs; make separate container (tii/tis/skip/*) that can
     // be configured as any number of files 1..N
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class FreqProxTermsWriterPerField : TermsHashConsumerPerField, IComparable<FreqProxTermsWriterPerField>
     {
         internal readonly FreqProxTermsWriter parent;
@@ -304,9 +301,6 @@ namespace Lucene.Net.Index
             return new FreqProxPostingsArray(size, hasFreq, hasProx, hasOffsets);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal sealed class FreqProxPostingsArray : ParallelPostingsArray
         {
             public FreqProxPostingsArray(int size, bool writeFreqs, bool writeProx, bool writeOffsets)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/FrozenBufferedUpdates.cs b/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
index 70dacef..a98c33c 100644
--- a/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
+++ b/src/Lucene.Net/Index/FrozenBufferedUpdates.cs
@@ -36,9 +36,6 @@ namespace Lucene.Net.Index
     /// structure to hold them. We don't hold docIDs because these are applied on
     /// flush.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class FrozenBufferedUpdates
     {
         /// <summary>Query we often undercount (say 24 bytes), plus int.</summary>
@@ -158,9 +155,6 @@ namespace Lucene.Net.Index
             return new IterableAnonymousInnerClassHelper(this);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class IterableAnonymousInnerClassHelper : IEnumerable<Term>
         {
             private readonly FrozenBufferedUpdates outerInstance;
@@ -187,9 +181,6 @@ namespace Lucene.Net.Index
             return new IterableAnonymousInnerClassHelper2(this);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class IterableAnonymousInnerClassHelper2 : IEnumerable<QueryAndLimit>
         {
             private readonly FrozenBufferedUpdates outerInstance;
@@ -209,9 +200,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/IndexCommit.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexCommit.cs b/src/Lucene.Net/Index/IndexCommit.cs
index 327afdc..f1f9fa0 100644
--- a/src/Lucene.Net/Index/IndexCommit.cs
+++ b/src/Lucene.Net/Index/IndexCommit.cs
@@ -39,9 +39,7 @@ namespace Lucene.Net.Index
     ///
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public abstract class IndexCommit : IComparable<IndexCommit>
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexDeletionPolicy.cs b/src/Lucene.Net/Index/IndexDeletionPolicy.cs
index d5daffe..b6d1044 100644
--- a/src/Lucene.Net/Index/IndexDeletionPolicy.cs
+++ b/src/Lucene.Net/Index/IndexDeletionPolicy.cs
@@ -51,9 +51,7 @@ namespace Lucene.Net.Index
     /// returns an independent instance able to work with any other <see cref="IndexWriter"/>
     /// or <see cref="Store.Directory"/> instance.</para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public abstract class IndexDeletionPolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexFileDeleter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexFileDeleter.cs b/src/Lucene.Net/Index/IndexFileDeleter.cs
index 76c3d9a..90d2fa1 100644
--- a/src/Lucene.Net/Index/IndexFileDeleter.cs
+++ b/src/Lucene.Net/Index/IndexFileDeleter.cs
@@ -66,9 +66,6 @@ namespace Lucene.Net.Index
     /// instantiating this class.  It opens segments_N file(s)
     /// directly with no retry logic.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class IndexFileDeleter : IDisposable
     {
         /// <summary>
@@ -761,9 +758,6 @@ namespace Lucene.Net.Index
         /// <summary>
         /// Tracks the reference count for a single index file:
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private sealed class RefCount
         {
             // fileName used only for better assert error messages
@@ -804,9 +798,7 @@ namespace Lucene.Net.Index
         /// has a natural ordering that is inconsistent with
         /// equals.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
+
         private sealed class CommitPoint : IndexCommit
         {
             internal ICollection<string> files;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexFileNames.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexFileNames.cs b/src/Lucene.Net/Index/IndexFileNames.cs
index f67c023..027116b 100644
--- a/src/Lucene.Net/Index/IndexFileNames.cs
+++ b/src/Lucene.Net/Index/IndexFileNames.cs
@@ -40,9 +40,7 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.internal
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class IndexFileNames
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexReader.cs b/src/Lucene.Net/Index/IndexReader.cs
index 3b72fc7..32badaf 100644
--- a/src/Lucene.Net/Index/IndexReader.cs
+++ b/src/Lucene.Net/Index/IndexReader.cs
@@ -67,9 +67,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 IndexReader : IDisposable
     {
         private bool closed = false;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexReaderContext.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexReaderContext.cs b/src/Lucene.Net/Index/IndexReaderContext.cs
index 4df5432..023b5c5 100644
--- a/src/Lucene.Net/Index/IndexReaderContext.cs
+++ b/src/Lucene.Net/Index/IndexReaderContext.cs
@@ -24,9 +24,6 @@ namespace Lucene.Net.Index
     /// A struct like class that represents a hierarchical relationship between
     /// <see cref="IndexReader"/> instances.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class IndexReaderContext
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriter.cs b/src/Lucene.Net/Index/IndexWriter.cs
index 2ef9c38..e3ddb15 100644
--- a/src/Lucene.Net/Index/IndexWriter.cs
+++ b/src/Lucene.Net/Index/IndexWriter.cs
@@ -441,9 +441,6 @@ namespace Lucene.Net.Index
         /// places if it is in "near real-time mode" (<see cref="GetReader()"/>
         /// has been called on this instance).
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class ReaderPool : IDisposable
         {
             private readonly IndexWriter outerInstance;
@@ -4044,9 +4041,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class MergedDeletesAndUpdates
         {
             internal ReadersAndUpdates mergedDeletesAndUpdates = null;
@@ -5620,9 +5614,6 @@ namespace Lucene.Net.Index
         /// <para/><b>NOTE</b>: <see cref="Warm(AtomicReader)"/> is called before any deletes have
         /// been carried over to the merged segment.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public abstract class IndexReaderWarmer
         {
             /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/IndexWriterConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/IndexWriterConfig.cs b/src/Lucene.Net/Index/IndexWriterConfig.cs
index 953b6fd..5cd5312 100644
--- a/src/Lucene.Net/Index/IndexWriterConfig.cs
+++ b/src/Lucene.Net/Index/IndexWriterConfig.cs
@@ -63,9 +63,6 @@ namespace Lucene.Net.Index
     /// @since 3.1
     /// </summary>
     /// <seealso cref="IndexWriter.Config"/>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class IndexWriterConfig : LiveIndexWriterConfig
     {
         // LUCENENET specific: De-nested OpenMode enum from this class to prevent naming conflict

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/InvertedDocConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/InvertedDocConsumer.cs b/src/Lucene.Net/Index/InvertedDocConsumer.cs
index 88e0fb8..6844c9d 100644
--- a/src/Lucene.Net/Index/InvertedDocConsumer.cs
+++ b/src/Lucene.Net/Index/InvertedDocConsumer.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 InvertedDocConsumer
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/InvertedDocConsumerPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/InvertedDocConsumerPerField.cs b/src/Lucene.Net/Index/InvertedDocConsumerPerField.cs
index 07231b1..e6d1a4e 100644
--- a/src/Lucene.Net/Index/InvertedDocConsumerPerField.cs
+++ b/src/Lucene.Net/Index/InvertedDocConsumerPerField.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 InvertedDocConsumerPerField
     {
         // Called once per field, and is given all IndexableField

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/InvertedDocEndConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/InvertedDocEndConsumer.cs b/src/Lucene.Net/Index/InvertedDocEndConsumer.cs
index d2c2d12..047a223 100644
--- a/src/Lucene.Net/Index/InvertedDocEndConsumer.cs
+++ b/src/Lucene.Net/Index/InvertedDocEndConsumer.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 InvertedDocEndConsumer
     {
         internal abstract void Flush(IDictionary<string, InvertedDocEndConsumerPerField> fieldsToFlush, SegmentWriteState state);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/InvertedDocEndConsumerPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/InvertedDocEndConsumerPerField.cs b/src/Lucene.Net/Index/InvertedDocEndConsumerPerField.cs
index 1254e23..909ed79 100644
--- a/src/Lucene.Net/Index/InvertedDocEndConsumerPerField.cs
+++ b/src/Lucene.Net/Index/InvertedDocEndConsumerPerField.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 InvertedDocEndConsumerPerField
     {
         internal abstract void Finish();

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/KeepOnlyLastCommitDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/KeepOnlyLastCommitDeletionPolicy.cs b/src/Lucene.Net/Index/KeepOnlyLastCommitDeletionPolicy.cs
index 1451327..c979a03 100644
--- a/src/Lucene.Net/Index/KeepOnlyLastCommitDeletionPolicy.cs
+++ b/src/Lucene.Net/Index/KeepOnlyLastCommitDeletionPolicy.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -26,9 +25,7 @@ namespace Lucene.Net.Index
     /// all prior commits after a new commit is done.  This is
     /// the default deletion policy.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class KeepOnlyLastCommitDeletionPolicy : IndexDeletionPolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/LiveIndexWriterConfig.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/LiveIndexWriterConfig.cs b/src/Lucene.Net/Index/LiveIndexWriterConfig.cs
index e42cf30..55d4f3f 100644
--- a/src/Lucene.Net/Index/LiveIndexWriterConfig.cs
+++ b/src/Lucene.Net/Index/LiveIndexWriterConfig.cs
@@ -35,9 +35,6 @@ namespace Lucene.Net.Index
     ///
     /// @since 4.0
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class LiveIndexWriterConfig
     {
         private readonly Analyzer analyzer;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/LogByteSizeMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/LogByteSizeMergePolicy.cs b/src/Lucene.Net/Index/LogByteSizeMergePolicy.cs
index 2311597..803b508 100644
--- a/src/Lucene.Net/Index/LogByteSizeMergePolicy.cs
+++ b/src/Lucene.Net/Index/LogByteSizeMergePolicy.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -23,9 +21,6 @@ namespace Lucene.Net.Index
     /// This is a <see cref="LogMergePolicy"/> that measures size of a
     /// segment as the total byte size of the segment's files.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class LogByteSizeMergePolicy : LogMergePolicy
     {
         /// <summary>Default minimum segment size. </summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/LogDocMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/LogDocMergePolicy.cs b/src/Lucene.Net/Index/LogDocMergePolicy.cs
index d514efe..01636b2 100644
--- a/src/Lucene.Net/Index/LogDocMergePolicy.cs
+++ b/src/Lucene.Net/Index/LogDocMergePolicy.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -24,9 +22,7 @@ namespace Lucene.Net.Index
     /// segment as the number of documents (not taking deletions
     /// into account).
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public class LogDocMergePolicy : LogMergePolicy
     {
         /// <summary> Default minimum segment size. </summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/LogMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/LogMergePolicy.cs b/src/Lucene.Net/Index/LogMergePolicy.cs
index fa69f6e..ce56539 100644
--- a/src/Lucene.Net/Index/LogMergePolicy.cs
+++ b/src/Lucene.Net/Index/LogMergePolicy.cs
@@ -41,9 +41,7 @@ namespace Lucene.Net.Index
     /// subclass that measures size as the total byte size of the
     /// file(s) for the segment.</para>
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public abstract class LogMergePolicy : MergePolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MergePolicy.cs b/src/Lucene.Net/Index/MergePolicy.cs
index a00bec6..0d59108 100644
--- a/src/Lucene.Net/Index/MergePolicy.cs
+++ b/src/Lucene.Net/Index/MergePolicy.cs
@@ -62,9 +62,6 @@ namespace Lucene.Net.Index
     ///
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class MergePolicy : IDisposable
     {
         /// <summary>
@@ -111,9 +108,7 @@ namespace Lucene.Net.Index
         ///  subset of segments to be merged as well as whether the
         ///  new segment should use the compound file format.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
+
         public class OneMerge
         {
             internal SegmentCommitInfo info; // used by IndexWriter
@@ -431,9 +426,7 @@ namespace Lucene.Net.Index
         /// necessary to perform multiple merges.  It simply
         /// contains a list of <see cref="OneMerge"/> instances.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
+
         public class MergeSpecification
         {
             /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MergeScheduler.cs b/src/Lucene.Net/Index/MergeScheduler.cs
index cdd1225..2a87084 100644
--- a/src/Lucene.Net/Index/MergeScheduler.cs
+++ b/src/Lucene.Net/Index/MergeScheduler.cs
@@ -29,9 +29,6 @@ namespace Lucene.Net.Index
     /// instance.</para>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class MergeScheduler : IDisposable, IMergeScheduler
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MergeState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MergeState.cs b/src/Lucene.Net/Index/MergeState.cs
index 942e2b9..ca131a0 100644
--- a/src/Lucene.Net/Index/MergeState.cs
+++ b/src/Lucene.Net/Index/MergeState.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -33,9 +32,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class MergeState
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiBits.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiBits.cs b/src/Lucene.Net/Index/MultiBits.cs
index 1894d1f..16af9a1 100644
--- a/src/Lucene.Net/Index/MultiBits.cs
+++ b/src/Lucene.Net/Index/MultiBits.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 using System.Text;
 
@@ -31,9 +30,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class MultiBits : IBits
     {
         private readonly IBits[] subs;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiDocValues.cs b/src/Lucene.Net/Index/MultiDocValues.cs
index 1a542f0..15d85da 100644
--- a/src/Lucene.Net/Index/MultiDocValues.cs
+++ b/src/Lucene.Net/Index/MultiDocValues.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
@@ -46,9 +45,6 @@ namespace Lucene.Net.Index
     /// @lucene.experimental
     /// @lucene.internal
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class MultiDocValues
     {
         /// <summary>
@@ -107,9 +103,6 @@ namespace Lucene.Net.Index
             return new NumericDocValuesAnonymousInnerClassHelper(values, starts);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class NumericDocValuesAnonymousInnerClassHelper : NumericDocValues
         {
             private NumericDocValues[] values;
@@ -178,9 +171,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class NumericDocValuesAnonymousInnerClassHelper2 : NumericDocValues
         {
             private NumericDocValues[] values;
@@ -310,9 +300,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class BinaryDocValuesAnonymousInnerClassHelper : BinaryDocValues
         {
             private BinaryDocValues[] values;
@@ -449,9 +436,6 @@ namespace Lucene.Net.Index
         /// maps per-segment ordinals to/from global ordinal space </summary>
         // TODO: use more efficient packed ints structures?
         // TODO: pull this out? its pretty generic (maps between N ord()-enabled TermsEnums)
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class OrdinalMap
         {
             // cache key of whoever asked for this awful thing
@@ -584,9 +568,6 @@ namespace Lucene.Net.Index
         /// <para/>
         /// @lucene.internal
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class MultiSortedDocValues : SortedDocValues
         {
             /// <summary>
@@ -656,9 +637,6 @@ namespace Lucene.Net.Index
         /// <para/>
         /// @lucene.internal
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class MultiSortedSetDocValues : SortedSetDocValues
         {
             /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiDocsAndPositionsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiDocsAndPositionsEnum.cs b/src/Lucene.Net/Index/MultiDocsAndPositionsEnum.cs
index b8092bf..8a6efa3 100644
--- a/src/Lucene.Net/Index/MultiDocsAndPositionsEnum.cs
+++ b/src/Lucene.Net/Index/MultiDocsAndPositionsEnum.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 
@@ -29,9 +28,7 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class MultiDocsAndPositionsEnum : DocsAndPositionsEnum
     {
         private readonly MultiTermsEnum parent;
@@ -206,9 +203,6 @@ namespace Lucene.Net.Index
         /// Holds a <see cref="Index.DocsAndPositionsEnum"/> along with the
         /// corresponding <see cref="ReaderSlice"/>.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public sealed class EnumWithSlice
         {
             internal EnumWithSlice()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiDocsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiDocsEnum.cs b/src/Lucene.Net/Index/MultiDocsEnum.cs
index d1e2e8a..8267582 100644
--- a/src/Lucene.Net/Index/MultiDocsEnum.cs
+++ b/src/Lucene.Net/Index/MultiDocsEnum.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 
@@ -28,9 +27,7 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class MultiDocsEnum : DocsEnum
     {
         private readonly MultiTermsEnum parent;
@@ -192,9 +189,6 @@ namespace Lucene.Net.Index
         /// Holds a <see cref="Index.DocsEnum"/> along with the
         /// corresponding <see cref="ReaderSlice"/>.
         /// </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public sealed class EnumWithSlice
         {
             internal EnumWithSlice()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiFields.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiFields.cs b/src/Lucene.Net/Index/MultiFields.cs
index b5e750c..eb3565f 100644
--- a/src/Lucene.Net/Index/MultiFields.cs
+++ b/src/Lucene.Net/Index/MultiFields.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Util;
-using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Diagnostics;
@@ -42,9 +41,7 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class MultiFields : Fields
     {
         private readonly Fields[] subs;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiReader.cs b/src/Lucene.Net/Index/MultiReader.cs
index 9cafc9c..c0a1e32 100644
--- a/src/Lucene.Net/Index/MultiReader.cs
+++ b/src/Lucene.Net/Index/MultiReader.cs
@@ -1,4 +1,3 @@
-using System;
 using System.IO;
 
 namespace Lucene.Net.Index
@@ -39,9 +38,6 @@ namespace Lucene.Net.Index
     /// <see cref="IndexReader"/> instance; use your own
     /// (non-Lucene) objects instead.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class MultiReader : BaseCompositeReader<IndexReader>
     {
         private readonly bool closeSubReaders;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiTerms.cs b/src/Lucene.Net/Index/MultiTerms.cs
index d6370a7..39e28b3 100644
--- a/src/Lucene.Net/Index/MultiTerms.cs
+++ b/src/Lucene.Net/Index/MultiTerms.cs
@@ -31,9 +31,7 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class MultiTerms : Terms
     {
         private readonly Terms[] subs;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/MultiTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/MultiTermsEnum.cs b/src/Lucene.Net/Index/MultiTermsEnum.cs
index 7fda1de..f2de0be 100644
--- a/src/Lucene.Net/Index/MultiTermsEnum.cs
+++ b/src/Lucene.Net/Index/MultiTermsEnum.cs
@@ -32,9 +32,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class MultiTermsEnum : TermsEnum
     {
         private readonly TermMergeQueue queue;
@@ -53,9 +50,6 @@ namespace Lucene.Net.Index
         private BytesRef current;
         private IComparer<BytesRef> termComp;
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class TermsEnumIndex
         {
             public static readonly TermsEnumIndex[] EMPTY_ARRAY = new TermsEnumIndex[0];
@@ -635,9 +629,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public sealed class TermsEnumWithSlice
         {
             internal ReaderSlice SubSlice { get; private set; }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NoDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NoDeletionPolicy.cs b/src/Lucene.Net/Index/NoDeletionPolicy.cs
index 865abeb..64c453e 100644
--- a/src/Lucene.Net/Index/NoDeletionPolicy.cs
+++ b/src/Lucene.Net/Index/NoDeletionPolicy.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -25,9 +24,6 @@ namespace Lucene.Net.Index
     /// deleting them. This class is a singleton and can be accessed by referencing
     /// <see cref="INSTANCE"/>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class NoDeletionPolicy : IndexDeletionPolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NoMergePolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NoMergePolicy.cs b/src/Lucene.Net/Index/NoMergePolicy.cs
index d137a22..2354988 100644
--- a/src/Lucene.Net/Index/NoMergePolicy.cs
+++ b/src/Lucene.Net/Index/NoMergePolicy.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -29,9 +28,6 @@ namespace Lucene.Net.Index
     /// executing merges, without going through the hassle of tweaking a merge
     /// policy's settings to achieve that, such as changing its merge factor.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class NoMergePolicy : MergePolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NoMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NoMergeScheduler.cs b/src/Lucene.Net/Index/NoMergeScheduler.cs
index 4283b78..5ecdcc5 100644
--- a/src/Lucene.Net/Index/NoMergeScheduler.cs
+++ b/src/Lucene.Net/Index/NoMergeScheduler.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// <see cref="MergeScheduler"/> implementation is ever executed. Hence it is
     /// recommended to use both if you want to disable merges from ever happening.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class NoMergeScheduler : MergeScheduler
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NormsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NormsConsumer.cs b/src/Lucene.Net/Index/NormsConsumer.cs
index a8e6b78..99a281c 100644
--- a/src/Lucene.Net/Index/NormsConsumer.cs
+++ b/src/Lucene.Net/Index/NormsConsumer.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -32,9 +31,7 @@ namespace Lucene.Net.Index
     /// for the doc/fields it saw, then the flush method below
     /// merges all of these together into a single _X.nrm file.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal sealed class NormsConsumer : InvertedDocEndConsumer
     {
         internal override void Abort()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NormsConsumerPerField.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NormsConsumerPerField.cs b/src/Lucene.Net/Index/NormsConsumerPerField.cs
index 32c16c6..332ebce 100644
--- a/src/Lucene.Net/Index/NormsConsumerPerField.cs
+++ b/src/Lucene.Net/Index/NormsConsumerPerField.cs
@@ -23,9 +23,6 @@ namespace Lucene.Net.Index
     using DocValuesConsumer = Lucene.Net.Codecs.DocValuesConsumer;
     using Similarity = Lucene.Net.Search.Similarities.Similarity;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class NormsConsumerPerField : InvertedDocEndConsumerPerField, IComparable<NormsConsumerPerField>
     {
         private readonly FieldInfo fieldInfo;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NumericDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NumericDocValues.cs b/src/Lucene.Net/Index/NumericDocValues.cs
index 226e16e..ba13d6e 100644
--- a/src/Lucene.Net/Index/NumericDocValues.cs
+++ b/src/Lucene.Net/Index/NumericDocValues.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -22,9 +20,6 @@ namespace Lucene.Net.Index
     /// <summary>
     /// A per-document numeric value.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class NumericDocValues
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NumericDocValuesFieldUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NumericDocValuesFieldUpdates.cs b/src/Lucene.Net/Index/NumericDocValuesFieldUpdates.cs
index 7d09541..eeff0bc 100644
--- a/src/Lucene.Net/Index/NumericDocValuesFieldUpdates.cs
+++ b/src/Lucene.Net/Index/NumericDocValuesFieldUpdates.cs
@@ -35,14 +35,8 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class NumericDocValuesFieldUpdates : DocValuesFieldUpdates
     {
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         new internal sealed class Iterator : DocValuesFieldUpdates.Iterator
         {
             private readonly int size;
@@ -161,9 +155,6 @@ namespace Lucene.Net.Index
             return new Iterator(size, values, docsWithField, docs);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class InPlaceMergeSorterAnonymousInnerClassHelper : InPlaceMergeSorter
         {
             private readonly NumericDocValuesFieldUpdates outerInstance;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/NumericDocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/NumericDocValuesWriter.cs b/src/Lucene.Net/Index/NumericDocValuesWriter.cs
index ae9e1e2..4129739 100644
--- a/src/Lucene.Net/Index/NumericDocValuesWriter.cs
+++ b/src/Lucene.Net/Index/NumericDocValuesWriter.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Util.Packed;
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -32,9 +31,6 @@ namespace Lucene.Net.Index
     /// Buffers up pending long per doc, then flushes when
     /// segment flushes.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class NumericDocValuesWriter : DocValuesWriter
     {
         private const long MISSING = 0L;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/OrdTermState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/OrdTermState.cs b/src/Lucene.Net/Index/OrdTermState.cs
index 4383d1c..7b89b0d 100644
--- a/src/Lucene.Net/Index/OrdTermState.cs
+++ b/src/Lucene.Net/Index/OrdTermState.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 
 namespace Lucene.Net.Index
@@ -25,9 +24,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class OrdTermState : TermState
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ParallelAtomicReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ParallelAtomicReader.cs b/src/Lucene.Net/Index/ParallelAtomicReader.cs
index 8de62a6..e35cb84 100644
--- a/src/Lucene.Net/Index/ParallelAtomicReader.cs
+++ b/src/Lucene.Net/Index/ParallelAtomicReader.cs
@@ -44,9 +44,6 @@ namespace Lucene.Net.Index
     /// same order to the other indexes. <em>Failure to do so will result in
     /// undefined behavior</em>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class ParallelAtomicReader : AtomicReader
     {
         private void InitializeInstanceFields()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ParallelCompositeReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ParallelCompositeReader.cs b/src/Lucene.Net/Index/ParallelCompositeReader.cs
index 7d552e1..a5ed16f 100644
--- a/src/Lucene.Net/Index/ParallelCompositeReader.cs
+++ b/src/Lucene.Net/Index/ParallelCompositeReader.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -47,9 +46,6 @@ namespace Lucene.Net.Index
     /// by number of documents per segment. If you use different <see cref="MergePolicy"/>s
     /// it might happen that the segment structure of your index is no longer predictable.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class ParallelCompositeReader : BaseCompositeReader<IndexReader>
     {
         private readonly bool closeSubReaders;
@@ -165,9 +161,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class ParallelAtomicReaderAnonymousInnerClassHelper : ParallelAtomicReader
         {
             public ParallelAtomicReaderAnonymousInnerClassHelper(Lucene.Net.Index.AtomicReader[] atomicSubs, Lucene.Net.Index.AtomicReader[] storedSubs)
@@ -180,9 +173,6 @@ namespace Lucene.Net.Index
             }
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class ParallelCompositeReaderAnonymousInnerClassHelper : ParallelCompositeReader
         {
             public ParallelCompositeReaderAnonymousInnerClassHelper(Lucene.Net.Index.CompositeReader[] compositeSubs, Lucene.Net.Index.CompositeReader[] storedSubs)

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ParallelPostingsArray.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ParallelPostingsArray.cs b/src/Lucene.Net/Index/ParallelPostingsArray.cs
index 94ac850..dc1b314 100644
--- a/src/Lucene.Net/Index/ParallelPostingsArray.cs
+++ b/src/Lucene.Net/Index/ParallelPostingsArray.cs
@@ -22,9 +22,6 @@ namespace Lucene.Net.Index
     using ArrayUtil = Lucene.Net.Util.ArrayUtil;
     using RamUsageEstimator = Lucene.Net.Util.RamUsageEstimator;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class ParallelPostingsArray
     {
         internal static readonly int BYTES_PER_POSTING = 3 * RamUsageEstimator.NUM_BYTES_INT32;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs b/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
index af28bf3..57c20c4 100644
--- a/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net/Index/PersistentSnapshotDeletionPolicy.cs
@@ -47,9 +47,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class PersistentSnapshotDeletionPolicy : SnapshotDeletionPolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/PrefixCodedTerms.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/PrefixCodedTerms.cs b/src/Lucene.Net/Index/PrefixCodedTerms.cs
index b45d573..86e9543 100644
--- a/src/Lucene.Net/Index/PrefixCodedTerms.cs
+++ b/src/Lucene.Net/Index/PrefixCodedTerms.cs
@@ -35,9 +35,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class PrefixCodedTerms : IEnumerable<Term>
     {
         internal readonly RAMFile buffer;
@@ -64,9 +61,6 @@ namespace Lucene.Net.Index
             return GetEnumerator();
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         internal class PrefixCodedTermsIterator : IEnumerator<Term>
         {
             private readonly IndexInput input;
@@ -138,9 +132,6 @@ namespace Lucene.Net.Index
 
         /// <summary>
         /// Builds a <see cref="PrefixCodedTerms"/>: call add repeatedly, then finish. </summary>
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         public class Builder
         {
             public Builder()

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/RandomAccessOrds.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/RandomAccessOrds.cs b/src/Lucene.Net/Index/RandomAccessOrds.cs
index f14a52d..91b3510 100644
--- a/src/Lucene.Net/Index/RandomAccessOrds.cs
+++ b/src/Lucene.Net/Index/RandomAccessOrds.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// Codecs can optionally extend this API if they support constant-time access
     /// to ordinals for the document.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class RandomAccessOrds : SortedSetDocValues
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ReaderSlice.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ReaderSlice.cs b/src/Lucene.Net/Index/ReaderSlice.cs
index 494fbaf..1eb3970 100644
--- a/src/Lucene.Net/Index/ReaderSlice.cs
+++ b/src/Lucene.Net/Index/ReaderSlice.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -24,9 +22,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.internal
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class ReaderSlice
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ReaderUtil.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ReaderUtil.cs b/src/Lucene.Net/Index/ReaderUtil.cs
index 1ac8360..914f3ba 100644
--- a/src/Lucene.Net/Index/ReaderUtil.cs
+++ b/src/Lucene.Net/Index/ReaderUtil.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -25,9 +24,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.internal
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class ReaderUtil
     {
         private ReaderUtil() // no instance

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/ReadersAndUpdates.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/ReadersAndUpdates.cs b/src/Lucene.Net/Index/ReadersAndUpdates.cs
index 06d823c..6e4cb03 100644
--- a/src/Lucene.Net/Index/ReadersAndUpdates.cs
+++ b/src/Lucene.Net/Index/ReadersAndUpdates.cs
@@ -44,9 +44,6 @@ namespace Lucene.Net.Index
     /// searching or merging), plus pending deletes and updates,
     /// for a given segment
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class ReadersAndUpdates
     {
         // Not final because we replace (clone) when we need to

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentCommitInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentCommitInfo.cs b/src/Lucene.Net/Index/SegmentCommitInfo.cs
index 34c3f49..9c71b5f 100644
--- a/src/Lucene.Net/Index/SegmentCommitInfo.cs
+++ b/src/Lucene.Net/Index/SegmentCommitInfo.cs
@@ -1,5 +1,4 @@
 using Lucene.Net.Support;
-using System;
 using System.Collections.Generic;
 
 namespace Lucene.Net.Index
@@ -29,9 +28,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SegmentCommitInfo
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentCoreReaders.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentCoreReaders.cs b/src/Lucene.Net/Index/SegmentCoreReaders.cs
index 17c3ea8..6a406a2 100644
--- a/src/Lucene.Net/Index/SegmentCoreReaders.cs
+++ b/src/Lucene.Net/Index/SegmentCoreReaders.cs
@@ -41,9 +41,6 @@ namespace Lucene.Net.Index
     /// Holds core readers that are shared (unchanged) when
     /// <see cref="SegmentReader"/> is cloned or reopened
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class SegmentCoreReaders
     {
         // Counts how many other readers share the core objects

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentDocValues.cs b/src/Lucene.Net/Index/SegmentDocValues.cs
index 8d65b07..d5935b7 100644
--- a/src/Lucene.Net/Index/SegmentDocValues.cs
+++ b/src/Lucene.Net/Index/SegmentDocValues.cs
@@ -34,9 +34,6 @@ namespace Lucene.Net.Index
     /// Manages the <see cref="DocValuesProducer"/> held by <see cref="SegmentReader"/> and
     /// keeps track of their reference counting.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class SegmentDocValues
     {
         private readonly IDictionary<long?, RefCount<DocValuesProducer>> genDVProducers = new Dictionary<long?, RefCount<DocValuesProducer>>();
@@ -56,9 +53,6 @@ namespace Lucene.Net.Index
             return new RefCountHelper(this, dvFormat.FieldsProducer(srs), gen);
         }
 
-#if FEATURE_SERIALIZABLE
-        [Serializable]
-#endif
         private class RefCountHelper : RefCount<DocValuesProducer>
         {
             private readonly SegmentDocValues outerInstance;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentInfo.cs b/src/Lucene.Net/Index/SegmentInfo.cs
index b7f25df..b28152c 100644
--- a/src/Lucene.Net/Index/SegmentInfo.cs
+++ b/src/Lucene.Net/Index/SegmentInfo.cs
@@ -35,9 +35,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class SegmentInfo
     {
         // TODO: remove these from this class, for now this is the representation

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentInfos.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentInfos.cs b/src/Lucene.Net/Index/SegmentInfos.cs
index 7d6f403..64ee3a0 100644
--- a/src/Lucene.Net/Index/SegmentInfos.cs
+++ b/src/Lucene.Net/Index/SegmentInfos.cs
@@ -109,9 +109,7 @@ namespace Lucene.Net.Index
     ///
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     public sealed class SegmentInfos : IEnumerable<SegmentCommitInfo>
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentMerger.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentMerger.cs b/src/Lucene.Net/Index/SegmentMerger.cs
index 77ce627..38513f5 100644
--- a/src/Lucene.Net/Index/SegmentMerger.cs
+++ b/src/Lucene.Net/Index/SegmentMerger.cs
@@ -41,9 +41,6 @@ namespace Lucene.Net.Index
     /// segments.
     /// </summary>
     /// <seealso cref="Merge()"/>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class SegmentMerger
     {
         private readonly Directory directory;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentReadState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentReadState.cs b/src/Lucene.Net/Index/SegmentReadState.cs
index e80e340..52268ea 100644
--- a/src/Lucene.Net/Index/SegmentReadState.cs
+++ b/src/Lucene.Net/Index/SegmentReadState.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SegmentReadState
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentReader.cs b/src/Lucene.Net/Index/SegmentReader.cs
index d17923b..30d2b79 100644
--- a/src/Lucene.Net/Index/SegmentReader.cs
+++ b/src/Lucene.Net/Index/SegmentReader.cs
@@ -1,6 +1,5 @@
 using Lucene.Net.Support;
 using Lucene.Net.Util;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Globalization;
@@ -43,9 +42,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class SegmentReader : AtomicReader
     {
         private readonly SegmentCommitInfo si;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SegmentWriteState.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SegmentWriteState.cs b/src/Lucene.Net/Index/SegmentWriteState.cs
index 0d2f091..67d14cf 100644
--- a/src/Lucene.Net/Index/SegmentWriteState.cs
+++ b/src/Lucene.Net/Index/SegmentWriteState.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -31,9 +29,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SegmentWriteState
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SerialMergeScheduler.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SerialMergeScheduler.cs b/src/Lucene.Net/Index/SerialMergeScheduler.cs
index 14dea0e..d65b21f 100644
--- a/src/Lucene.Net/Index/SerialMergeScheduler.cs
+++ b/src/Lucene.Net/Index/SerialMergeScheduler.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -23,9 +21,6 @@ namespace Lucene.Net.Index
     /// A <see cref="MergeScheduler"/> that simply does each merge
     /// sequentially, using the current thread.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SerialMergeScheduler : MergeScheduler
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SimpleMergedSegmentWarmer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SimpleMergedSegmentWarmer.cs b/src/Lucene.Net/Index/SimpleMergedSegmentWarmer.cs
index 26989ce..f1f32a5 100644
--- a/src/Lucene.Net/Index/SimpleMergedSegmentWarmer.cs
+++ b/src/Lucene.Net/Index/SimpleMergedSegmentWarmer.cs
@@ -27,9 +27,6 @@ namespace Lucene.Net.Index
     /// A very simple merged segment warmer that just ensures
     /// data structures are initialized.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SimpleMergedSegmentWarmer : IndexReaderWarmer
     {
         private readonly InfoStream infoStream;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SingleTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SingleTermsEnum.cs b/src/Lucene.Net/Index/SingleTermsEnum.cs
index bb89193..f167496 100644
--- a/src/Lucene.Net/Index/SingleTermsEnum.cs
+++ b/src/Lucene.Net/Index/SingleTermsEnum.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// that need only visit one term, but want to preserve
     /// <see cref="Search.MultiTermQuery"/> semantics such as <see cref="Search.MultiTermQuery.MultiTermRewriteMethod"/>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class SingleTermsEnum : FilteredTermsEnum
     {
         private readonly BytesRef singleRef;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SingletonSortedSetDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SingletonSortedSetDocValues.cs b/src/Lucene.Net/Index/SingletonSortedSetDocValues.cs
index 22cc8c4..78fe98b 100644
--- a/src/Lucene.Net/Index/SingletonSortedSetDocValues.cs
+++ b/src/Lucene.Net/Index/SingletonSortedSetDocValues.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Diagnostics;
 
 namespace Lucene.Net.Index
@@ -29,9 +28,6 @@ namespace Lucene.Net.Index
     /// against e.g. <see cref="Search.IFieldCache.GetDocTermOrds(AtomicReader, string)"/> that also works for single-valued
     /// fields.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class SingletonSortedSetDocValues : SortedSetDocValues
     {
         private readonly SortedDocValues @in;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SlowCompositeReaderWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SlowCompositeReaderWrapper.cs b/src/Lucene.Net/Index/SlowCompositeReaderWrapper.cs
index 7be60e5..e51298f 100644
--- a/src/Lucene.Net/Index/SlowCompositeReaderWrapper.cs
+++ b/src/Lucene.Net/Index/SlowCompositeReaderWrapper.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -41,9 +40,6 @@ namespace Lucene.Net.Index
     /// atomic leaves and then operate per-AtomicReader,
     /// instead of using this class.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public sealed class SlowCompositeReaderWrapper : AtomicReader
     {
         private readonly CompositeReader @in;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SnapshotDeletionPolicy.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SnapshotDeletionPolicy.cs b/src/Lucene.Net/Index/SnapshotDeletionPolicy.cs
index 8015092..4550a0c 100644
--- a/src/Lucene.Net/Index/SnapshotDeletionPolicy.cs
+++ b/src/Lucene.Net/Index/SnapshotDeletionPolicy.cs
@@ -40,9 +40,6 @@ namespace Lucene.Net.Index
     /// <para/>
     /// @lucene.experimental
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public class SnapshotDeletionPolicy : IndexDeletionPolicy
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SortedDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SortedDocValues.cs b/src/Lucene.Net/Index/SortedDocValues.cs
index 99417d8..051bdd4 100644
--- a/src/Lucene.Net/Index/SortedDocValues.cs
+++ b/src/Lucene.Net/Index/SortedDocValues.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// dictionary value (ordinal) can be retrieved for each document. Ordinals
     /// are dense and in increasing sorted order.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class SortedDocValues : BinaryDocValues
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs b/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs
index 8ea7576..c74825a 100644
--- a/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs
+++ b/src/Lucene.Net/Index/SortedDocValuesTermsEnum.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -28,9 +27,7 @@ namespace Lucene.Net.Index
     /// Implements a <see cref="TermsEnum"/> wrapping a provided
     /// <see cref="SortedDocValues"/>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal class SortedDocValuesTermsEnum : TermsEnum
     {
         private readonly SortedDocValues values;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SortedDocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SortedDocValuesWriter.cs b/src/Lucene.Net/Index/SortedDocValuesWriter.cs
index b97c2c4..a8b58da 100644
--- a/src/Lucene.Net/Index/SortedDocValuesWriter.cs
+++ b/src/Lucene.Net/Index/SortedDocValuesWriter.cs
@@ -1,7 +1,6 @@
 using Lucene.Net.Codecs;
 using Lucene.Net.Util;
 using Lucene.Net.Util.Packed;
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -28,9 +27,6 @@ namespace Lucene.Net.Index
     /// Buffers up pending <see cref="T:byte[]"/> per doc, deref and sorting via
     /// int ord, then flushes when segment flushes.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class SortedDocValuesWriter : DocValuesWriter
     {
         internal readonly BytesRefHash hash;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SortedSetDocValues.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SortedSetDocValues.cs b/src/Lucene.Net/Index/SortedSetDocValues.cs
index f07d218..dc047c9 100644
--- a/src/Lucene.Net/Index/SortedSetDocValues.cs
+++ b/src/Lucene.Net/Index/SortedSetDocValues.cs
@@ -1,5 +1,3 @@
-using System;
-
 namespace Lucene.Net.Index
 {
     /*
@@ -29,9 +27,6 @@ namespace Lucene.Net.Index
     /// dictionary value (ordinal) can be retrieved for each document. Ordinals
     /// are dense and in increasing sorted order.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     public abstract class SortedSetDocValues
     {
         /// <summary>

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs b/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs
index 2ad6e82..3906178 100644
--- a/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs
+++ b/src/Lucene.Net/Index/SortedSetDocValuesTermsEnum.cs
@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 
@@ -28,9 +27,7 @@ namespace Lucene.Net.Index
     /// Implements a <see cref="TermsEnum"/> wrapping a provided
     /// <see cref="SortedSetDocValues"/>.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
+
     internal class SortedSetDocValuesTermsEnum : TermsEnum
     {
         private readonly SortedSetDocValues values;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/SortedSetDocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/SortedSetDocValuesWriter.cs b/src/Lucene.Net/Index/SortedSetDocValuesWriter.cs
index a37ebce..04d7bb5 100644
--- a/src/Lucene.Net/Index/SortedSetDocValuesWriter.cs
+++ b/src/Lucene.Net/Index/SortedSetDocValuesWriter.cs
@@ -37,9 +37,6 @@ namespace Lucene.Net.Index
     /// Buffers up pending <see cref="T:byte[]"/>s per doc, deref and sorting via
     /// int ord, then flushes when segment flushes.
     /// </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal class SortedSetDocValuesWriter : DocValuesWriter
     {
         internal readonly BytesRefHash hash;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/StandardDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/StandardDirectoryReader.cs b/src/Lucene.Net/Index/StandardDirectoryReader.cs
index 0d78142..dc5c746 100644
--- a/src/Lucene.Net/Index/StandardDirectoryReader.cs
+++ b/src/Lucene.Net/Index/StandardDirectoryReader.cs
@@ -27,9 +27,6 @@ namespace Lucene.Net.Index
     using IOContext = Lucene.Net.Store.IOContext;
     using IOUtils = Lucene.Net.Util.IOUtils;
 
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class StandardDirectoryReader : DirectoryReader
     {
         private readonly IndexWriter writer;

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/StoredFieldsConsumer.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/StoredFieldsConsumer.cs b/src/Lucene.Net/Index/StoredFieldsConsumer.cs
index af07bb2..b7a2cde 100644
--- a/src/Lucene.Net/Index/StoredFieldsConsumer.cs
+++ b/src/Lucene.Net/Index/StoredFieldsConsumer.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 StoredFieldsConsumer
     {
         public abstract void AddField(int docID, IIndexableField field, FieldInfo fieldInfo);

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/389daee7/src/Lucene.Net/Index/StoredFieldsProcessor.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Index/StoredFieldsProcessor.cs b/src/Lucene.Net/Index/StoredFieldsProcessor.cs
index ff03302..3789e25 100644
--- a/src/Lucene.Net/Index/StoredFieldsProcessor.cs
+++ b/src/Lucene.Net/Index/StoredFieldsProcessor.cs
@@ -30,9 +30,6 @@ namespace Lucene.Net.Index
 
     /// <summary>
     /// This is a <see cref="StoredFieldsConsumer"/> that writes stored fields. </summary>
-#if FEATURE_SERIALIZABLE
-    [Serializable]
-#endif
     internal sealed class StoredFieldsProcessor : StoredFieldsConsumer
     {
         internal StoredFieldsWriter fieldsWriter;


Mime
View raw message