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
The following commit(s) were added to refs/heads/master by this push:
new 8ebd830 Removed .NET Standard 1.x Features (#523)
8ebd830 is described below
commit 8ebd83090165d4688729040ea12ad4ed588bf7bf
Author: Shad Storhaug <[email protected]>
AuthorDate: Mon Sep 27 01:51:56 2021 +0700
Removed .NET Standard 1.x Features (#523)
* Removed FEATURE_CULTUREINFO_GETCULTURES and NETSTANDARD1_X
* Removed FEATURE_DTD_PROCESSING
* Removed FEATURE_XSLT
* Removed FEATURE_STACKTRACE
* Removed FEATURE_APPDOMAIN_ISFULLYTRUSTED
* Removed FEATURE_APPDOMAIN_BASEDIRECTORY
* Removed FEATURE_APPDOMAIN_GETASSEMBLIES
* Removed FEATURE_METHODBASE_GETMETHODBODY
---
Directory.Build.targets | 15 -
.../Compound/Hyphenation/HyphenationTree.cs | 9 +-
.../Analysis/Compound/Hyphenation/PatternParser.cs | 11 +-
.../Dict/BinaryDictionary.cs | 8 +-
src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs | 4 -
.../Xml/QueryTemplateManager.cs | 4 +-
.../Support/ApiScanTestBase.cs | 6 +-
.../Support/CultureInfoSupport.cs | 643 ---------------------
.../Support/StackTraceHelper.cs | 46 +-
.../Util/LuceneTestCase.cs | 18 +-
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Xml/TestQueryTemplateManager.cs | 6 +-
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Support/TestApiConsistency.cs | 4 +-
.../Support/TestApiConsistency.cs | 2 -
.../Index/TestIndexWriterExceptions.cs | 3 -
src/Lucene.Net.Tests/Support/TestApiConsistency.cs | 2 -
src/Lucene.Net.Tests/Support/TestToStringUtils.cs | 2 +-
src/Lucene.Net/Support/AssemblyUtils.cs | 19 -
.../Support/Compatibility/NullableAttributes.cs | 2 +-
src/Lucene.Net/Support/Util/NamedServiceFactory.cs | 8 +-
.../Support/TestApiConsistency.cs | 4 +-
40 files changed, 24 insertions(+), 850 deletions(-)
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 9ccf545..b48f3f8 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -58,20 +58,12 @@
<!-- Features in .NET Framework 4.5+, .NET Standard 2.x, .NET Core 2.x, .NET
Core 3.x, .NET 5.x, and .NET 6.x -->
<PropertyGroup Condition=" $(TargetFramework.StartsWith('net4')) Or
$(TargetFramework.StartsWith('netstandard2.')) Or
$(TargetFramework.StartsWith('netcoreapp2.')) Or
$(TargetFramework.StartsWith('netcoreapp3.')) Or '$(TargetFramework)' ==
'net5.0' Or '$(TargetFramework)' == 'net6.0' ">
-
<DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_BASEDIRECTORY</DefineConstants>
-
<DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_GETASSEMBLIES</DefineConstants>
-
<DefineConstants>$(DefineConstants);FEATURE_APPDOMAIN_ISFULLYTRUSTED</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_ASSEMBLY_GETCALLINGASSEMBLY</DefineConstants>
-
<DefineConstants>$(DefineConstants);FEATURE_CULTUREINFO_GETCULTURES</DefineConstants>
-
<DefineConstants>$(DefineConstants);FEATURE_DTD_PROCESSING</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_FILESTREAM_LOCK</DefineConstants>
-
<DefineConstants>$(DefineConstants);FEATURE_METHODBASE_GETMETHODBODY</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_SERIALIZABLE</DefineConstants>
- <DefineConstants>$(DefineConstants);FEATURE_STACKTRACE</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_TEXTWRITER_CLOSE</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_THREADPOOL_UNSAFEQUEUEWORKITEM</DefineConstants>
<DefineConstants>$(DefineConstants);FEATURE_TYPE_GETMETHOD__BINDINGFLAGS_PARAMS</DefineConstants>
- <DefineConstants>$(DefineConstants);FEATURE_XSLT</DefineConstants>
</PropertyGroup>
@@ -82,13 +74,6 @@
</PropertyGroup>
- <!-- Features in .NET Standard 1.x and .NET Core 1.x -->
- <PropertyGroup Condition=" $(TargetFramework.StartsWith('netstandard1.')) Or
$(TargetFramework.StartsWith('netcoreapp1.')) ">
-
- <DefineConstants>$(DefineConstants);NETSTANDARD1_X</DefineConstants>
-
- </PropertyGroup>
-
<!-- Features in .NET Framework 4.6.1+ only -->
<PropertyGroup Condition="'$(TargetFramework)' == 'net461' Or
'$(TargetFramework)' == 'net462' Or $(TargetFramework.StartsWith('net47')) Or
$(TargetFramework.StartsWith('net48'))">
diff --git
a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
index e59acb5..3b3882b 100644
---
a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
+++
b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/HyphenationTree.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
using J2N.Numerics;
using System;
using System.Collections.Generic;
@@ -181,15 +181,8 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
var xmlReaderSettings =
new XmlReaderSettings
{
- // DTD Processing currently is
- // not supported in .NET Standard but will come back in
.NET Standard 2.0.
- // https://github.com/dotnet/corefx/issues/4376.
-#if FEATURE_DTD_PROCESSING
DtdProcessing = DtdProcessing.Parse,
XmlResolver = new PatternParser.DtdResolver()
-#else
- DtdProcessing = DtdProcessing.Ignore
-#endif
};
using var reader = XmlReader.Create(new StreamReader(source,
encoding), xmlReaderSettings);
diff --git
a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
index 0ed4a58..bc6112f 100644
---
a/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
+++
b/src/Lucene.Net.Analysis.Common/Analysis/Compound/Hyphenation/PatternParser.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
using J2N;
using System;
using System.Collections.Generic;
@@ -196,15 +196,8 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
new XmlReaderSettings
{
- // DTD Processing currently is
- // not supported in .NET Standard 1.x but will come back
in .NET Standard 2.0.
- // https://github.com/dotnet/corefx/issues/4376.
-#if FEATURE_DTD_PROCESSING
DtdProcessing = DtdProcessing.Parse,
XmlResolver = new DtdResolver()
-#else
- DtdProcessing = DtdProcessing.Ignore
-#endif
};
}
@@ -377,7 +370,6 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
return il.ToString();
}
-#if FEATURE_DTD_PROCESSING
/// <summary>
/// LUCENENET specific helper class to force the DTD file to be read
from the embedded resource
/// rather than from the file system.
@@ -395,7 +387,6 @@ namespace Lucene.Net.Analysis.Compound.Hyphenation
return base.GetEntity(absoluteUri, role, ofObjectToReturn);
}
}
-#endif
//
// ContentHandler methods
diff --git a/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
b/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
index 8ce02fd..90a45fa 100644
--- a/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
+++ b/src/Lucene.Net.Analysis.Kuromoji/Dict/BinaryDictionary.cs
@@ -61,13 +61,7 @@ namespace Lucene.Net.Analysis.Ja.Dict
private static string LoadDataDir()
{
// LUCENENET specific - reformatted with :, renamed from
"analysis.data.dir"
- string currentPath =
SystemProperties.GetProperty("kuromoji:data:dir",
-#if FEATURE_APPDOMAIN_BASEDIRECTORY
- AppDomain.CurrentDomain.BaseDirectory
-#else
- System.AppContext.BaseDirectory
-#endif
- );
+ string currentPath =
SystemProperties.GetProperty("kuromoji:data:dir",
AppDomain.CurrentDomain.BaseDirectory);
// If a matching directory path is found, set our DATA_DIR static
// variable. If it is null or empty after this process, we need to
diff --git a/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
b/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
index a3a9456..9ae93b5 100644
--- a/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
+++ b/src/Lucene.Net.Analysis.SmartCn/AnalyzerProfile.cs
@@ -74,11 +74,7 @@ namespace Lucene.Net.Analysis.Cn.Smart
if (ANALYSIS_DATA_DIR.Length != 0)
return;
-#if FEATURE_APPDOMAIN_BASEDIRECTORY
string currentPath = AppDomain.CurrentDomain.BaseDirectory;
-#else
- string currentPath = System.AppContext.BaseDirectory;
-#endif
string candidatePath = System.IO.Path.Combine(currentPath,
dirName);
if (Directory.Exists(candidatePath))
diff --git a/src/Lucene.Net.QueryParser/Xml/QueryTemplateManager.cs
b/src/Lucene.Net.QueryParser/Xml/QueryTemplateManager.cs
index 0299dd7..4cace06 100644
--- a/src/Lucene.Net.QueryParser/Xml/QueryTemplateManager.cs
+++ b/src/Lucene.Net.QueryParser/Xml/QueryTemplateManager.cs
@@ -1,5 +1,4 @@
-#if FEATURE_XSLT
-using System.Collections.Generic;
+using System.Collections.Generic;
using System.IO;
using System.Xml;
using System.Xml.Xsl;
@@ -180,4 +179,3 @@ namespace Lucene.Net.QueryParsers.Xml
}
}
}
-#endif
diff --git a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
index 854ddae..cdfdb2d 100644
--- a/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
+++ b/src/Lucene.Net.TestFramework/Support/ApiScanTestBase.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Support;
+using Lucene.Net.Support;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -250,7 +250,6 @@ namespace Lucene.Net.Util
"the consumer if the array is not cloned using
arr.ToArray().");
}
-#if FEATURE_METHODBASE_GETMETHODBODY
//[Test, LuceneNetSpecific]
public virtual void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
@@ -268,7 +267,6 @@ namespace Lucene.Net.Util
"An array should be cloned before returning using
arr.ToArray() or if it is intended to be writable, " +
"decorate with the WritableArray attribute and consider making
it a property for clarity.");
}
-#endif
//[Test, LuceneNetSpecific]
public virtual void TestForPublicMembersContainingComparer(Type
typeFromTargetAssembly)
@@ -844,7 +842,6 @@ namespace Lucene.Net.Util
return result.ToArray();
}
-#if FEATURE_METHODBASE_GETMETHODBODY
private static IEnumerable<string>
GetMethodsThatReturnWritableArray(Assembly assembly)
{
var result = new List<string>();
@@ -898,7 +895,6 @@ namespace Lucene.Net.Util
return result.ToArray();
}
-#endif
private static IEnumerable<string>
GetPublicNullableEnumMembers(Assembly assembly)
{
diff --git a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
b/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
deleted file mode 100644
index 3b2cea5..0000000
--- a/src/Lucene.Net.TestFramework/Support/CultureInfoSupport.cs
+++ /dev/null
@@ -1,643 +0,0 @@
-using System.Globalization;
-
-namespace Lucene.Net.Util
-{
- /*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
- public static class CultureInfoSupport
- {
-#if !FEATURE_CULTUREINFO_GETCULTURES
-
- #region culturePool
- private static readonly string[] specificCulturePool =
- {
- "fr-KM",
- "fr-LU",
- "fr-MA",
- "fr-MC",
- "fr-MF",
- "fr-MG",
- "fr-ML",
- "fr-MQ",
- "fr-MR",
- "fr-MU",
- "fr-NC",
- "fr-NE",
- "fr-PF",
- "fr-PM",
- "fr-RE",
- "fr-RW",
- "fr-SC",
- "fr-SN",
- "fr-SY",
- "fr-TD",
- "fr-TG",
- "fr-TN",
- "fr-VU",
- "fr-WF",
- "fr-YT",
- "fur-IT",
- "fy-NL",
- "ga-IE",
- "gd-GB",
- "gl-ES",
- "gn-PY",
- "gsw-CH",
- "gsw-FR",
- "gsw-LI",
- "gu-IN",
- "guz-KE",
- "gv-IM",
- "ha-Latn-GH",
- "ha-Latn-NE",
- "ha-Latn-NG",
- "haw-US",
- "he-IL",
- "hi-IN",
- "hr-BA",
- "hr-HR",
- "hsb-DE",
- "hu-HU",
- "hy-AM",
- "ia-001",
- "ia-FR",
- "ibb-NG",
- "id-ID",
- "ig-NG",
- "ii-CN",
- "is-IS",
- "it-CH",
- "it-IT",
- "it-SM",
- "iu-Cans-CA",
- "iu-Latn-CA",
- "ja-JP",
- "jgo-CM",
- "jmc-TZ",
- "jv-Java-ID",
- "jv-Latn-ID",
- "ka-GE",
- "kab-DZ",
- "kam-KE",
- "kde-TZ",
- "kea-CV",
- "khq-ML",
- "ki-KE",
- "kk-KZ",
- "kkj-CM",
- "kl-GL",
- "kln-KE",
- "km-KH",
- "kn-IN",
- "ko-KP",
- "ko-KR",
- "kok-IN",
- "kr-NG",
- "ks-Arab-IN",
- "ks-Deva-IN",
- "ksb-TZ",
- "ksf-CM",
- "ksh-DE",
- "ku-Arab-IQ",
- "ku-Arab-IR",
- "kw-GB",
- "ky-KG",
- "la-001",
- "lag-TZ",
- "lb-LU",
- "lg-UG",
- "lkt-US",
- "ln-AO",
- "ln-CD",
- "ln-CF",
- "ln-CG",
- "lo-LA",
- "lrc-IQ",
- "lrc-IR",
- "lt-LT",
- "lu-CD",
- "luo-KE",
- "luy-KE",
- "lv-LV",
- "mas-KE",
- "mas-TZ",
- "mer-KE",
- "mfe-MU",
- "mg-MG",
- "mgh-MZ",
- "mgo-CM",
- "mi-NZ",
- "mk-MK",
- "ml-IN",
- "mn-MN",
- "mn-Mong-CN",
- "mn-Mong-MN",
- "mni-IN",
- "moh-CA",
- "mr-IN",
- "ms-BN",
- "ms-MY",
- "ms-SG",
- "mt-MT",
- "mua-CM",
- "my-MM",
- "mzn-IR",
- "naq-NA",
- "nb-NO",
- "nb-SJ",
- "nd-ZW",
- "ne-IN",
- "ne-NP",
- "nl-AW",
- "nl-BE",
- "nl-BQ",
- "nl-CW",
- "nl-NL",
- "nl-SR",
- "nl-SX",
- "nmg-CM",
- "nn-NO",
- "nnh-CM",
- "nqo-GN",
- "nr-ZA",
- "nso-ZA",
- "nus-SS",
- "nyn-UG",
- "oc-FR",
- "om-ET",
- "om-KE",
- "or-IN",
- "os-GE",
- "os-RU",
- "pa-Arab-PK",
- "pa-IN",
- "pap-029",
- "pl-PL",
- "prg-001",
- "prs-AF",
- "ps-AF",
- "pt-AO",
- "pt-BR",
- "pt-CV",
- "pt-GW",
- "pt-MO",
- "pt-MZ",
- "pt-PT",
- "pt-ST",
- "pt-TL",
- "quc-Latn-GT",
- "quz-BO",
- "quz-EC",
- "quz-PE",
- "rm-CH",
- "rn-BI",
- "ro-MD",
- "ro-RO",
- "rof-TZ",
- "ru-BY",
- "ru-KG",
- "ru-KZ",
- "ru-MD",
- "ru-RU",
- "ru-UA",
- "rw-RW",
- "rwk-TZ",
- "sa-IN",
- "sah-RU",
- "saq-KE",
- "sbp-TZ",
- "sd-Arab-PK",
- "sd-Deva-IN",
- "se-FI",
- "se-NO",
- "se-SE",
- "seh-MZ",
- "ses-ML",
- "sg-CF",
- "shi-Latn-MA",
- "shi-Tfng-MA",
- "si-LK",
- "sk-SK",
- "sl-SI",
- "sma-NO",
- "sma-SE",
- "smj-NO",
- "smj-SE",
- "smn-FI",
- "sms-FI",
- "sn-Latn-ZW",
- "so-DJ",
- "so-ET",
- "so-KE",
- "so-SO",
- "sq-AL",
- "sq-MK",
- "sq-XK",
- "sr-Cyrl-BA",
- "sr-Cyrl-ME",
- "sr-Cyrl-RS",
- "sr-Cyrl-XK",
- "sr-Latn-BA",
- "sr-Latn-ME",
- "sr-Latn-RS",
- "sr-Latn-XK",
- "ss-SZ",
- "ss-ZA",
- "ssy-ER",
- "st-LS",
- "st-ZA",
- "sv-AX",
- "sv-FI",
- "sv-SE",
- "sw-CD",
- "sw-KE",
- "sw-TZ",
- "sw-UG",
- "syr-SY",
- "ta-IN",
- "ta-LK",
- "ta-MY",
- "ta-SG",
- "te-IN",
- "teo-KE",
- "teo-UG",
- "tg-Cyrl-TJ",
- "th-TH",
- "ti-ER",
- "ti-ET",
- "tig-ER",
- "tk-TM",
- "tn-BW",
- "tn-ZA",
- "to-TO",
- "tr-CY",
- "tr-TR",
- "ts-ZA",
- "tt-RU",
- "twq-NE",
- "tzm-Arab-MA",
- "tzm-Latn-DZ",
- "tzm-Latn-MA",
- "tzm-Tfng-MA",
- "ug-CN",
- "uk-UA",
- "ur-IN",
- "ur-PK",
- "uz-Arab-AF",
- "uz-Cyrl-UZ",
- "uz-Latn-UZ",
- "vai-Latn-LR",
- "vai-Vaii-LR",
- "ve-ZA",
- "vi-VN",
- "vo-001",
- "vun-TZ",
- "wae-CH",
- "wal-ET",
- "wo-SN",
- "xh-ZA",
- "xog-UG",
- "yav-CM",
- "yi-001",
- "yo-BJ",
- "yo-NG",
- "zgh-Tfng-MA",
- "zh-CN",
- "zh-Hans-HK",
- "zh-Hans-MO",
- "zh-HK",
- "zh-MO",
- "zh-SG",
- "zh-TW",
- "zu-ZA"
- };
- private static readonly string[] neutralCulturePool =
- {
- "aa",
- "af",
- "agq",
- "ak",
- "am",
- "ar",
- "arn",
- "as",
- "asa",
- "ast",
- "az",
- "az-Cyrl",
- "az-Latn",
- "ba",
- "bas",
- "be",
- "bem",
- "bez",
- "bg",
- "bin",
- "bm",
- "bm-Latn",
- "bn",
- "bo",
- "br",
- "brx",
- "bs",
- "bs-Cyrl",
- "bs-Latn",
- "byn",
- "ca",
- "ce",
- "cgg",
- "chr",
- "chr-Cher",
- "co",
- "cs",
- "cu",
- "cy",
- "da",
- "dav",
- "de",
- "dje",
- "dsb",
- "dua",
- "dv",
- "dyo",
- "dz",
- "ebu",
- "ee",
- "el",
- "en",
- "eo",
- "es",
- "et",
- "eu",
- "ewo",
- "fa",
- "ff",
- "ff-Latn",
- "fi",
- "fil",
- "fo",
- "fr",
- "fur",
- "fy",
- "ga",
- "gd",
- "gl",
- "gn",
- "gsw",
- "gu",
- "guz",
- "gv",
- "ha",
- "ha-Latn",
- "haw",
- "he",
- "hi",
- "hr",
- "hsb",
- "hu",
- "hy",
- "ia",
- "ibb",
- "id",
- "ig",
- "ii",
- "is",
- "it",
- "iu",
- "iu-Cans",
- "iu-Latn",
- "ja",
- "jgo",
- "jmc",
- "jv",
- "jv-Java",
- "jv-Latn",
- "ka",
- "kab",
- "kam",
- "kde",
- "kea",
- "khq",
- "ki",
- "kk",
- "kkj",
- "kl",
- "kln",
- "km",
- "kn",
- "ko",
- "kok",
- "kr",
- "ks",
- "ks-Arab",
- "ks-Deva",
- "ksb",
- "ksf",
- "ksh",
- "ku",
- "ku-Arab",
- "kw",
- "ky",
- "la",
- "lag",
- "lb",
- "lg",
- "lkt",
- "ln",
- "lo",
- "lrc",
- "lt",
- "lu",
- "luo",
- "luy",
- "lv",
- "mas",
- "mer",
- "mfe",
- "mg",
- "mgh",
- "mgo",
- "mi",
- "mk",
- "ml",
- "mn",
- "mn-Cyrl",
- "mn-Mong",
- "mni",
- "moh",
- "mr",
- "ms",
- "mt",
- "mua",
- "my",
- "mzn",
- "naq",
- "nb",
- "nd",
- "ne",
- "nl",
- "nmg",
- "nn",
- "nnh",
- "no",
- "nqo",
- "nr",
- "nso",
- "nus",
- "nyn",
- "oc",
- "om",
- "or",
- "os",
- "pa",
- "pa-Arab",
- "pap",
- "pl",
- "prg",
- "prs",
- "ps",
- "pt",
- "quc",
- "quc-Latn",
- "quz",
- "rm",
- "rn",
- "ro",
- "rof",
- "ru",
- "rw",
- "rwk",
- "sa",
- "sah",
- "saq",
- "sbp",
- "sd",
- "sd-Arab",
- "sd-Deva",
- "se",
- "seh",
- "ses",
- "sg",
- "shi",
- "shi-Latn",
- "shi-Tfng",
- "si",
- "sk",
- "sl",
- "sma",
- "smj",
- "smn",
- "sms",
- "sn",
- "sn-Latn",
- "so",
- "sq",
- "sr",
- "sr-Cyrl",
- "sr-Latn",
- "ss",
- "ssy",
- "st",
- "sv",
- "sw",
- "syr",
- "ta",
- "te",
- "teo",
- "tg",
- "tg-Cyrl",
- "th",
- "ti",
- "tig",
- "tk",
- "tn",
- "to",
- "tr",
- "ts",
- "tt",
- "twq",
- "tzm",
- "tzm-Arab",
- "tzm-Latn",
- "tzm-Tfng",
- "ug",
- "uk",
- "ur",
- "uz",
- "uz-Arab",
- "uz-Cyrl",
- "uz-Latn",
- "vai",
- "vai-Latn",
- "vai-Vaii",
- "ve",
- "vi",
- "vo",
- "vun",
- "wae",
- "wal",
- "wo",
- "xh",
- "xog",
- "yav",
- "yi",
- "yo",
- "zgh",
- "zgh-Tfng",
- "zh",
- "zh-Hans",
- "zh-Hant",
- "zu",
- "zh-CHS",
- "zh-CHT"
- };
- #endregion culturePool
- private static readonly CultureInfo[] supportedSpecificCultures =
LoadSupportedCultures(specificCulturePool);
- private static readonly CultureInfo[] supportedNeutralCultures =
LoadSupportedCultures(neutralCulturePool);
-
- private static CultureInfo[] LoadSupportedCultures(string[]
culturePool)
- {
- var cultures = new List<CultureInfo>();
-
- foreach (var culture in culturePool)
- {
- try
- {
- cultures.Add(new CultureInfo(culture));
- }
- catch (Exception)
- {
- // ignore
- }
- }
-
- return cultures.ToArray();
- }
-#endif
-
- public static CultureInfo[] GetNeutralAndSpecificCultures()
- {
-#if !FEATURE_CULTUREINFO_GETCULTURES
- return
supportedSpecificCultures.Union(supportedNeutralCultures).ToArray();
-#else
- return CultureInfo.GetCultures(CultureTypes.SpecificCultures |
CultureTypes.NeutralCultures);
-#endif
-
- }
- }
-}
diff --git a/src/Lucene.Net.TestFramework/Support/StackTraceHelper.cs
b/src/Lucene.Net.TestFramework/Support/StackTraceHelper.cs
index 294c8fd..773f26e 100644
--- a/src/Lucene.Net.TestFramework/Support/StackTraceHelper.cs
+++ b/src/Lucene.Net.TestFramework/Support/StackTraceHelper.cs
@@ -1,12 +1,5 @@
-using System;
-
-#if FEATURE_STACKTRACE
+using System;
using System.Diagnostics;
-#else
-using System.Collections.Generic;
-using System.Linq;
-using System.Text.RegularExpressions;
-#endif
namespace Lucene.Net.Util
{
@@ -41,7 +34,6 @@ namespace Lucene.Net.Util
/// </summary>
public static bool DoesStackTraceContainMethod(string methodName)
{
-#if FEATURE_STACKTRACE
StackTrace trace = new StackTrace();
foreach (var frame in trace.GetFrames())
{
@@ -51,10 +43,6 @@ namespace Lucene.Net.Util
}
}
return false;
-#else
- IEnumerable<string> allMethods = GetStackTrace(false);
- return allMethods.Contains(methodName);
-#endif
}
/// <summary>
@@ -65,7 +53,6 @@ namespace Lucene.Net.Util
/// </summary>
public static bool DoesStackTraceContainMethod(string className,
string methodName)
{
-#if FEATURE_STACKTRACE
StackTrace trace = new StackTrace();
foreach (var frame in trace.GetFrames())
{
@@ -76,37 +63,6 @@ namespace Lucene.Net.Util
}
}
return false;
-#else
- IEnumerable<string> allMethods = GetStackTrace(true);
- return allMethods.Any(x => x.Contains(className + '.' +
methodName));
-#endif
- }
-
-#if !FEATURE_STACKTRACE
- private static readonly Regex METHOD_NAME_REGEX = new
Regex(@"at\s+(?<fullyQualifiedMethod>.*\.(?<method>[\w`]+))\(");
-
- private static IEnumerable<string> GetStackTrace(bool
includeFullyQualifiedName)
- {
- var matches =
- Environment.StackTrace
- .Split(new string[] { Environment.NewLine },
StringSplitOptions.RemoveEmptyEntries)
- .Select(line =>
- {
- var match = METHOD_NAME_REGEX.Match(line);
-
- if (!match.Success)
- {
- return null;
- }
-
- return includeFullyQualifiedName
- ? match.Groups["fullyQualifiedMethod"].Value
- : match.Groups["method"].Value;
- })
- .Where(line => !string.IsNullOrEmpty(line));
-
- return matches;
}
-#endif
}
}
diff --git a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
index 2dcc036..fb9a072 100644
--- a/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
+++ b/src/Lucene.Net.TestFramework/Util/LuceneTestCase.cs
@@ -2081,14 +2081,7 @@ namespace Lucene.Net.Util
/// </summary>
public static CultureInfo RandomCulture(Random random) // LUCENENET
specific renamed from RandomLocale
{
- ICollection<CultureInfo> systemCultures =
CultureInfoSupport.GetNeutralAndSpecificCultures();
-#if NETSTANDARD1_X
- // .NET Core 1.0 on macOS seems to be flakey here and not return
results occasionally, so compensate by
- // returning CultureInfo.InvariantCulture when it happens.
- if (systemCultures.Count == 0)
- return CultureInfo.InvariantCulture;
-#endif
- return RandomPicks.RandomFrom(random, systemCultures);
+ return RandomPicks.RandomFrom(random,
CultureInfo.GetCultures(CultureTypes.SpecificCultures |
CultureTypes.NeutralCultures));
}
/// <summary>
@@ -2098,14 +2091,7 @@ namespace Lucene.Net.Util
/// </summary>
public static TimeZoneInfo RandomTimeZone(Random random)
{
- var systemTimeZones = TimeZoneInfo.GetSystemTimeZones();
-#if NETSTANDARD1_X
- // .NET Core 1.0 on macOS seems to be flakey here and not return
results occasionally, so compensate by
- // returning TimeZoneInfo.Local when it happens.
- if (systemTimeZones.Count == 0)
- return TimeZoneInfo.Local;
-#endif
- return RandomPicks.RandomFrom(random, systemTimeZones);
+ return RandomPicks.RandomFrom(random,
TimeZoneInfo.GetSystemTimeZones());
}
/// <summary>
diff --git a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
index efe8e56..e1716be 100644
--- a/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Common/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-// Lucene version compatibility level 4.8.1
+// Lucene version compatibility level 4.8.1
using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
@@ -84,14 +84,12 @@ namespace Lucene.Net.Analysis
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Standard.ClassicAnalyzer))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Standard.ClassicAnalyzer))]
diff --git
a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
index b4c0ecd..ce63c60 100644
--- a/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Kuromoji/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Analysis.Ja.Support
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Ja.GraphvizFormatter))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Ja.GraphvizFormatter))]
diff --git
a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
index 4d2ac91..4d1f319 100644
--- a/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Phonetic/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Analysis.Phonetic
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Phonetic.BeiderMorseFilter))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Phonetic.BeiderMorseFilter))]
diff --git
a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
index 3da3406..d0804f4 100644
--- a/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.SmartCn/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Analysis.Cn.Smart.Support
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Cn.Smart.AnalyzerProfile))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Cn.Smart.AnalyzerProfile))]
diff --git
a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
index 8b38bad..7310d98 100644
--- a/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Analysis.Stempel/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Analysis.Stempel
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Stempel.StempelFilter))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Stempel.StempelFilter))]
diff --git a/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
index 92b3a9e..ec323e7 100644
--- a/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Benchmark/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Benchmarks.Support
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Benchmarks.Constants))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Benchmarks.Constants))]
diff --git a/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
index d60e6c2..f98e566 100644
--- a/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Classification/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Classification
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Classification.KNearestNeighborClassifier))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Classification.KNearestNeighborClassifier))]
diff --git a/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
index 1ae37eb..a02d364 100644
--- a/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Codecs/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Codecs.Tests
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Codecs.BlockTerms.BlockTermsReader))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Codecs.BlockTerms.BlockTermsReader))]
diff --git a/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
index 46c8f45..45f3378 100644
--- a/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Expressions/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Expressions
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Expressions.Bindings))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Expressions.Bindings))]
diff --git a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
index 3bb6777..989ccbb 100644
--- a/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Facet/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Facet
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Facet.Facets))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Facet.Facets))]
diff --git a/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
index 2888ca7..d80b7b6 100644
--- a/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Grouping/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Grouping
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Grouping.ICollectedSearchGroup))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Grouping.ICollectedSearchGroup))]
diff --git a/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
index d3df197..689638b 100644
--- a/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Highlighter/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Search
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Highlight.DefaultEncoder))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Highlight.DefaultEncoder))]
diff --git a/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
index 2d4838b..d730a25 100644
--- a/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Join/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Search.Join
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Join.FakeScorer))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Join.FakeScorer))]
diff --git a/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
index f6a8972..235aea8 100644
--- a/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Memory/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Memory
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Index.Memory.MemoryIndex))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Index.Memory.MemoryIndex))]
diff --git a/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
index c1d9b92..bffd3ca 100644
--- a/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Misc/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Misc
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Misc.SweetSpotSimilarity))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Misc.SweetSpotSimilarity))]
diff --git a/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
index 4a09a32..c7de71e 100644
--- a/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Queries/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Queries
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Queries.BooleanFilter))]
diff --git a/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
index e6b625e..8565794 100644
--- a/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.QueryParsers
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.QueryParsers.Classic.ICharStream))]
diff --git a/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
b/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
index a47f45f..9b2925e 100644
--- a/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
+++ b/src/Lucene.Net.Tests.QueryParser/Xml/TestQueryTemplateManager.cs
@@ -1,5 +1,4 @@
-#if FEATURE_XSLT
-using J2N.Text;
+using J2N.Text;
using Lucene.Net.Analysis;
using Lucene.Net.Documents;
using Lucene.Net.Index;
@@ -181,5 +180,4 @@ namespace Lucene.Net.QueryParsers.Xml
base.TearDown();
}
}
-}
-#endif
+}
\ No newline at end of file
diff --git a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
index e34708b..2927e59 100644
--- a/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Replicator/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Replicator
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Replicator.IReplicator))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Replicator.IReplicator))]
diff --git a/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
index 958df95..e910abf 100644
--- a/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Sandbox/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Sandbox
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Sandbox.Queries.DuplicateFilter))]
diff --git a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
index 56b7254..c2d71dd 100644
--- a/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Spatial/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Spatial
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Spatial.DisjointSpatialFilter))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Spatial.DisjointSpatialFilter))]
diff --git a/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
index b2da8c4..8ff7c46 100644
--- a/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.Suggest/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Tests.Suggest
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Suggest.IInputEnumerator))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Search.Suggest.IInputEnumerator))]
diff --git a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
index ab068f2..a17e51b 100644
--- a/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests.TestFramework/Support/TestApiConsistency.cs
@@ -84,14 +84,12 @@ namespace Lucene.Net.Tests.TestFramework
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.RandomExtensions))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.RandomExtensions))]
diff --git a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
index 544343a..5d774c3 100644
--- a/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
+++ b/src/Lucene.Net.Tests/Index/TestIndexWriterExceptions.cs
@@ -2459,9 +2459,6 @@ namespace Lucene.Net.Index
}
}
-#if NETSTANDARD1_X
- [Slow]
-#endif
[Test]
public virtual void TestRandomExceptionDuringRollback()
{
diff --git a/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
b/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
index 8f8a50a..d048fa8 100644
--- a/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
+++ b/src/Lucene.Net.Tests/Support/TestApiConsistency.cs
@@ -83,14 +83,12 @@ namespace Lucene.Net
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Analyzer))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Analysis.Analyzer))]
diff --git a/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
b/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
index d6869a0..5c8ae79 100644
--- a/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
+++ b/src/Lucene.Net.Tests/Support/TestToStringUtils.cs
@@ -61,7 +61,7 @@ namespace Lucene.Net.Support
float boostZeroNonFractional = 0f;
float boostZeroFractional = 0.123f;
- var cultures = CultureInfoSupport.GetNeutralAndSpecificCultures();
+ var cultures =
CultureInfo.GetCultures(CultureTypes.SpecificCultures |
CultureTypes.NeutralCultures);
foreach (CultureInfo culture in cultures)
{
diff --git a/src/Lucene.Net/Support/AssemblyUtils.cs
b/src/Lucene.Net/Support/AssemblyUtils.cs
index 370b12a..85b7007 100644
--- a/src/Lucene.Net/Support/AssemblyUtils.cs
+++ b/src/Lucene.Net/Support/AssemblyUtils.cs
@@ -3,9 +3,6 @@ using System.Collections.Generic;
using System.Globalization;
using System.Linq;
using System.Reflection;
-#if !FEATURE_APPDOMAIN_GETASSEMBLIES
-using Microsoft.Extensions.DependencyModel;
-#endif
using JCG = J2N.Collections.Generic;
namespace Lucene.Net.Support
@@ -45,16 +42,7 @@ namespace Lucene.Net.Support
// hoping would be loaded hasn't been loaded yet into the app
domain,
// it is unavailable. So we go to the next level on each and check
each referenced
// assembly.
-#if FEATURE_APPDOMAIN_GETASSEMBLIES
var assembliesLoaded = AppDomain.CurrentDomain.GetAssemblies();
-#else
- var dependencyContext = DependencyContext.Default;
- var assemblyNames = dependencyContext.RuntimeLibraries
- .SelectMany(lib =>
lib.GetDefaultAssemblyNames(dependencyContext))
- .Where(x => !DotNetFrameworkFilter.IsFrameworkAssembly(x))
- .Distinct();
- var assembliesLoaded = LoadAssemblyFromName(assemblyNames);
-#endif
var nonFrameworkAssembliesLoaded = assembliesLoaded.Where(x =>
!DotNetFrameworkFilter.IsFrameworkAssembly(x));
var referencedAssemblies = nonFrameworkAssembliesLoaded
@@ -71,13 +59,6 @@ namespace Lucene.Net.Support
return
nonFrameworkAssembliesLoaded.Concat(referencedAssemblies).Distinct();
}
-#if !FEATURE_APPDOMAIN_GETASSEMBLIES
- private static IEnumerable<Assembly>
LoadAssemblyFromName(IEnumerable<AssemblyName> assemblyNames)
- {
- return assemblyNames.Select(x => LoadAssemblyFromName(x)).Where(x
=> x != null);
- }
-#endif
-
private static Assembly LoadAssemblyFromName(AssemblyName assemblyName)
{
try
diff --git a/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs
b/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs
index 24b98df..6219f13 100644
--- a/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs
+++ b/src/Lucene.Net/Support/Compatibility/NullableAttributes.cs
@@ -1,6 +1,6 @@
#pragma warning disable MA0048 // File name must match type name
#define INTERNAL_NULLABLE_ATTRIBUTES
-#if NETSTANDARD1_X || NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 ||
NETCOREAPP2_2 || NET45 || NET451 || NET452 || NET6 || NET461 || NET462 || NET47
|| NET471 || NET472 || NET48
+#if NETSTANDARD2_0 || NETCOREAPP2_0 || NETCOREAPP2_1 || NETCOREAPP2_2 || NET45
|| NET451 || NET452 || NET46 || NET461 || NET462 || NET47 || NET471 || NET472
|| NET48
//
https://github.com/dotnet/corefx/blob/48363ac826ccf66fbe31a5dcb1dc2aab9a7dd768/src/Common/src/CoreLib/System/Diagnostics/CodeAnalysis/NullableAttributes.cs
diff --git a/src/Lucene.Net/Support/Util/NamedServiceFactory.cs
b/src/Lucene.Net/Support/Util/NamedServiceFactory.cs
index 4d9325f..178d560 100644
--- a/src/Lucene.Net/Support/Util/NamedServiceFactory.cs
+++ b/src/Lucene.Net/Support/Util/NamedServiceFactory.cs
@@ -168,12 +168,6 @@ namespace Lucene.Net.Util
/// <summary>
/// Gets a value that indicates whether the current application domain
executes with full trust.
/// </summary>
- protected bool IsFullyTrusted =>
-#if FEATURE_APPDOMAIN_ISFULLYTRUSTED
- AppDomain.CurrentDomain.IsFullyTrusted; // Partial trust support
-#else
- true; // Partial trust not supported
-#endif
-
+ protected bool IsFullyTrusted =>
AppDomain.CurrentDomain.IsFullyTrusted; // Partial trust support
}
}
diff --git a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
index fbb22d2..ff55a7b 100644
--- a/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
+++ b/src/dotnet/Lucene.Net.Tests.ICU/Support/TestApiConsistency.cs
@@ -1,4 +1,4 @@
-using Lucene.Net.Attributes;
+using Lucene.Net.Attributes;
using Lucene.Net.Util;
using NUnit.Framework;
using System;
@@ -83,14 +83,12 @@ namespace Lucene.Net.Support
base.TestForPropertiesThatReturnArray(typeFromTargetAssembly);
}
-#if FEATURE_METHODBASE_GETMETHODBODY
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Collation.ICUCollationAttributeFactory))]
public override void TestForMethodsThatReturnWritableArray(Type
typeFromTargetAssembly)
{
base.TestForMethodsThatReturnWritableArray(typeFromTargetAssembly);
}
-#endif
[Test, LuceneNetSpecific]
[TestCase(typeof(Lucene.Net.Collation.ICUCollationAttributeFactory))]
