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 4a780489ef2a0dbd1f1e608cfa07adc181e5070e Author: Shad Storhaug <[email protected]> AuthorDate: Fri Sep 11 11:14:07 2020 +0700 Directory.Build.targets: Added FEATURE_APPDOMAIN_BASEDIRECTORY and implemented throughout solution --- Directory.Build.targets | 1 + src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs | 6 +++--- src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs | 6 +++--- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Directory.Build.targets b/Directory.Build.targets index 92de61f..dd7223b 100644 --- a/Directory.Build.targets +++ b/Directory.Build.targets @@ -57,6 +57,7 @@ <!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, and .NET Core 3.x --> <PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or $(TargetFramework.StartsWith('netstandard2.')) Or $(TargetFramework.StartsWith('netcoreapp2.')) Or $(TargetFramework.StartsWith('netcoreapp3.')) "> + <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_BASEDIRECTORY</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_ISFULLYTRUSTED</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_CONCURRENTMERGESCHEDULER</DefineConstants> <DefineConstants>$(DefineConstants);FEATURE_CULTUREINFO_GETCULTURES</DefineConstants> diff --git a/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs b/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs index 81552b8..3532165 100644 --- a/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs +++ b/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs @@ -61,10 +61,10 @@ namespace Lucene.Net.Analysis.Ja.Dict { // LUCENENET specific - reformatted with :, renamed from "analysis.data.dir" string currentPath = SystemProperties.GetProperty("kuromoji:data:dir", -#if NETSTANDARD1_6 - System.AppContext.BaseDirectory -#else +#if FEATURE_APPDOMAIN_BASEDIRECTORY AppDomain.CurrentDomain.BaseDirectory +#else + System.AppContext.BaseDirectory #endif ); diff --git a/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs b/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs index 2acf2a1..ae18014 100644 --- a/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs +++ b/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs @@ -74,10 +74,10 @@ namespace Lucene.Net.Analysis.Cn.Smart if (ANALYSIS_DATA_DIR.Length != 0) return; -#if NETSTANDARD1_6 - string currentPath = System.AppContext.BaseDirectory; -#else +#if FEATURE_APPDOMAIN_BASEDIRECTORY string currentPath = AppDomain.CurrentDomain.BaseDirectory; +#else + string currentPath = System.AppContext.BaseDirectory; #endif //FileInfo[] cadidateFiles = new FileInfo[] { new FileInfo(currentPath + "/" + dirName),
