This is an automated email from the ASF dual-hosted git repository. nightowl888 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/lucenenet.git
commit d371ed10e68c8617af8c23dcf07e4ca473789de5 Author: Shad Storhaug <[email protected]> AuthorDate: Fri Sep 11 07:06:46 2020 +0700 Directory.Build.targets: Added FEATURE_TEXTWRITER_CLOSE, FEATURE_TEXTWRITER_CREATEOBJREF, and FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE and implemented throughout solution --- Directory.Build.targets | 3 +++ .../Analysis/Util/BufferedCharFilter.cs | 10 ++++++---- .../Analysis/Util/TestBufferedCharFilter.cs | 2 +- src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs | 11 ++++------- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index e4089d0..f091862 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -62,6 +62,8 @@ <DefineConstants>$(DefineConstants);FEATURE_FILESTREAM_LOCK</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_METHODBASE_GETMETHODBODY</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_CLOSE</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREAD_INTERRUPT</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREAD_PRIORITY</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_THREAD_YIELD</DefineConstants> @@ -96,6 +98,7 @@ <!-- Although HostProtectionAttribute is available in .NET Standard 2.0+ via platform extensions, we are excluding it due to the fact it is not a primary feature of Lucene.NET --> <DefineConstants>$(DefineConstants);FEATURE_SECURITYPERMISSIONS_HOSTPROTECTION</DefineConstants> + <DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_CREATEOBJREF</DefineConstants> <DebugType>full</DebugType> </PropertyGroup> diff --git a/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs b/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs index 7f36260..e96223c 100644 --- a/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs +++ b/src/Lucene.Net.Analysis.Common/Analysis/Util/BufferedCharFilter.cs @@ -70,7 +70,7 @@ namespace Lucene.Net.Analysis.Util private int mark = -1; private int markLimit = -1; -#if !NETSTANDARD1_6 +#if FEATURE_TEXTWRITER_CLOSE /// <summary> /// LUCENENET specific to throw an exception if the user calls <see cref="Close()"/> instead of <see cref="TextReader.Dispose()"/> /// </summary> @@ -115,7 +115,7 @@ namespace Lucene.Net.Analysis.Util { if (disposing) { -#if !NETSTANDARD1_6 +#if FEATURE_TEXTWRITER_CLOSE this.isDisposing = true; #endif lock (m_lock) @@ -127,7 +127,7 @@ namespace Lucene.Net.Analysis.Util buf = null; } } -#if !NETSTANDARD1_6 +#if FEATURE_TEXTWRITER_CLOSE this.isDisposing = false; #endif } @@ -607,12 +607,14 @@ namespace Lucene.Net.Analysis.Util { throw new NotImplementedException(); } -#if !NETSTANDARD1_6 +#if FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE public override object InitializeLifetimeService() { throw new NotImplementedException(); } +#endif +#if FEATURE_TEXTWRITER_CLOSE public override void Close() { if (!isDisposing) diff --git a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs index c6d0fe8..cc9cd0e 100644 --- a/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs +++ b/src/Lucene.Net.Tests.Analysis.Common/Analysis/Util/TestBufferedCharFilter.cs @@ -296,7 +296,7 @@ namespace Lucene.Net.Analysis.Util return SIZE - pos > 0; } -//#if !NETSTANDARD +//#if FEATURE_TEXTWRITER_CLOSE // public override void Close() // { // } diff --git a/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs b/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs index 41176c1..615f934 100644 --- a/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs +++ b/src/Lucene.Net/Support/IO/SafeTextWriterWrapper.cs @@ -1,9 +1,6 @@ using System; using System.IO; using System.Runtime.CompilerServices; -#if !NETSTANDARD -using System.Runtime.Remoting; -#endif using System.Text; using System.Threading.Tasks; @@ -80,14 +77,14 @@ namespace Lucene.Net.Support.IO } } -#if !NETSTANDARD1_6 +#if FEATURE_TEXTWRITER_CLOSE public override void Close() { Run(() => textWriter.Close()); } #endif -#if !NETSTANDARD - public override ObjRef CreateObjRef(Type requestedType) +#if FEATURE_TEXTWRITER_CREATEOBJREF + public override System.Runtime.Remoting.ObjRef CreateObjRef(Type requestedType) { return Run(() => textWriter.CreateObjRef(requestedType)); } @@ -114,7 +111,7 @@ namespace Lucene.Net.Support.IO return Run(() => textWriter.GetHashCode()); } -#if !NETSTANDARD1_6 +#if FEATURE_TEXTWRITER_INITIALIZELIFETIMESERVICE public override object InitializeLifetimeService() { return Run(() => textWriter.InitializeLifetimeService());
