lucenenet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nightowl...@apache.org
Subject [7/8] lucenenet git commit: Removed FEATURE_MARSHAL_BY_REF, FEATURE_CLOSEABLE, FEATURE_LIFETIME_SERVICE and replaced with !NETSTANDARD
Date Sat, 08 Apr 2017 15:48:27 GMT
Removed FEATURE_MARSHAL_BY_REF, FEATURE_CLOSEABLE, FEATURE_LIFETIME_SERVICE and replaced with
!NETSTANDARD


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

Branch: refs/heads/api-work
Commit: 24270ca2e55837608e77e55b8225797a8146e02a
Parents: 8156274
Author: Shad Storhaug <shad@shadstorhaug.com>
Authored: Fri Apr 7 22:56:35 2017 +0700
Committer: Shad Storhaug <shad@shadstorhaug.com>
Committed: Sat Apr 8 22:47:50 2017 +0700

----------------------------------------------------------------------
 src/Lucene.Net/Support/SafeTextWriterWrapper.cs | 8 +++-----
 src/Lucene.Net/project.json                     | 5 +----
 2 files changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/24270ca2/src/Lucene.Net/Support/SafeTextWriterWrapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/Support/SafeTextWriterWrapper.cs b/src/Lucene.Net/Support/SafeTextWriterWrapper.cs
index 507bb8a..b4e5f8e 100644
--- a/src/Lucene.Net/Support/SafeTextWriterWrapper.cs
+++ b/src/Lucene.Net/Support/SafeTextWriterWrapper.cs
@@ -1,6 +1,6 @@
 ´╗┐using System;
 using System.IO;
-#if FEATURE_MARSHAL_BY_REF
+#if !NETSTANDARD
 using System.Runtime.Remoting;
 #endif
 using System.Text;
@@ -67,14 +67,12 @@ namespace Lucene.Net.Support
             }
         }
 
-#if FEATURE_CLOSEABLE
+#if !NETSTANDARD
         public override void Close()
         {
             Run(() => textWriter.Close());
         }
-#endif
 
-#if FEATURE_MARSHAL_BY_REF
         public override ObjRef CreateObjRef(Type requestedType)
         {
             return Run(() => textWriter.CreateObjRef(requestedType));
@@ -101,7 +99,7 @@ namespace Lucene.Net.Support
             return Run(() => textWriter.GetHashCode());
         }
 
-#if FEATURE_LIFETIME_SERVICE
+#if !NETSTANDARD
         public override object InitializeLifetimeService()
         {
             return Run(() => textWriter.InitializeLifetimeService());

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/24270ca2/src/Lucene.Net/project.json
----------------------------------------------------------------------
diff --git a/src/Lucene.Net/project.json b/src/Lucene.Net/project.json
index 7859a30..dd0d5d4 100644
--- a/src/Lucene.Net/project.json
+++ b/src/Lucene.Net/project.json
@@ -64,10 +64,7 @@
         "define": [
           "FEATURE_CLONEABLE",
           "FEATURE_SERIALIZABLE",
-          "FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM",
-          "FEATURE_MARSHAL_BY_REF",
-          "FEATURE_CLOSEABLE",
-          "FEATURE_LIFETIME_SERVICE"
+          "FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM"
         ]
       }
     }


Mime
View raw message