Merges the changes from the release/3.0 branch to release/4.0 branch

src/Examine.Core/Examine.Core.csproj

@@ -8,7 +8,6 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <LangVersion>9</LangVersion>
-    <NoWarn>RS0036</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>

src/Examine.Core/ExamineManager.cs

@@ -14,12 +14,12 @@ public class ExamineManager : IDisposable, IExamineManager
         /// <inheritdoc/>
         public ExamineManager(IEnumerable<IIndex> indexes, IEnumerable<ISearcher> searchers)
         {
-            foreach(IIndex i in indexes)
+            foreach(var i in indexes)
             {
                 AddIndex(i);
             }
 
-            foreach(ISearcher s in searchers)
+            foreach(var s in searchers)
             {
                 AddSearcher(s);
             }

src/Examine.Core/OrderedDictionary.cs

@@ -26,7 +26,10 @@ public OrderedDictionary(IEqualityComparer<TKey> comparer) : base(comparer)
         /// <inheritdoc/>
         public TVal GetItem(int index)
         {
-            if (index >= Count) throw new IndexOutOfRangeException();
+            if (index >= Count)
+            {
+                throw new IndexOutOfRangeException();
+            }
 
             var found = base[index];
 
@@ -36,30 +39,31 @@ public TVal GetItem(int index)
         /// <inheritdoc/>
         public int IndexOf(TKey key)
         {
-            if (base.Dictionary == null) return -1;
-            if (base.Dictionary.TryGetValue(key, out KeyValuePair<TKey, TVal> found))
+            if (Dictionary == null)
+            {
+                return -1;
+            }
+
+            if (Dictionary.TryGetValue(key, out var found))
             {
-                return base.Items.IndexOf(found);
+                return Items.IndexOf(found);
             }
             return -1;
         }
 
         /// <inheritdoc/>
-        protected override TKey GetKeyForItem(KeyValuePair<TKey, TVal> item)
-        {
-            return item.Key;
-        }
+        protected override TKey GetKeyForItem(KeyValuePair<TKey, TVal> item) => item.Key;
 
         /// <inheritdoc/>
-        public bool ContainsKey(TKey key)
-        {            
-            return base.Contains(key);
-        }
+        public bool ContainsKey(TKey key) => Contains(key);
 
         /// <inheritdoc/>
         public void Add(TKey key, TVal value)
         {
-            if (base.Contains(key)) throw new ArgumentException("The key " + key + " already exists in this collection");
+            if (Contains(key))
+            {
+                throw new ArgumentException("The key " + key + " already exists in this collection");
+            }
 
             base.Add(new KeyValuePair<TKey, TVal>(key, value));
         }
@@ -74,19 +78,19 @@ public bool TryGetValue(TKey key,
 #endif
             out TVal value)
         {
-            if (base.Dictionary == null)
+            if (Dictionary == null)
             {
-                value = default(TVal);
+                value = default;
                 return false;
             }
 
-            if (base.Dictionary.TryGetValue(key, out KeyValuePair<TKey, TVal> found))
+            if (Dictionary.TryGetValue(key, out var found))
             {
                 value = found.Value;
                 return true;
             }
 
-            value = default(TVal);
+            value = default;
             return false;
         }
 
@@ -100,24 +104,24 @@ TVal IDictionary<TKey, TVal>.this[TKey key]
         {
             get
             {
-                if (base.Dictionary != null && 
-                    base.Dictionary.TryGetValue(key, out KeyValuePair<TKey, TVal> found))
+                if (Dictionary != null &&
+                    Dictionary.TryGetValue(key, out var found))
                 {
                     return found.Value;
                 }
                 throw new KeyNotFoundException();
             }
             set
             {
-                if (base.Dictionary != null && 
-                    base.Dictionary.TryGetValue(key, out KeyValuePair<TKey, TVal> found))
+                if (Dictionary != null &&
+                    Dictionary.TryGetValue(key, out var found))
                 {
-                    var index = base.Items.IndexOf(found);
-                    base.SetItem(index, new KeyValuePair<TKey, TVal>(key, value));
+                    var index = Items.IndexOf(found);
+                    SetItem(index, new KeyValuePair<TKey, TVal>(key, value));
                 }
                 else
                 {
-                    base.Add(new KeyValuePair<TKey, TVal>(key, value));
+                    Add(new KeyValuePair<TKey, TVal>(key, value));
                 }
             }
         }
@@ -126,9 +130,9 @@ TVal IDictionary<TKey, TVal>.this[TKey key]
         private static readonly ICollection<TVal> EmptyValues = new List<TVal>();
 
         /// <inheritdoc/>
-        public ICollection<TKey> Keys => base.Dictionary != null ? base.Dictionary.Keys : EmptyCollection;
+        public ICollection<TKey> Keys => Dictionary != null ? Dictionary.Keys : EmptyCollection;
 
         /// <inheritdoc/>
-        public ICollection<TVal> Values => base.Dictionary != null ? base.Dictionary.Values.Select(x => x.Value).ToArray() : EmptyValues;
+        public ICollection<TVal> Values => Dictionary != null ? Dictionary.Values.Select(x => x.Value).ToArray() : EmptyValues;
     }
 }

src/Examine.Core/Search/FacetLabel.cs

@@ -8,15 +8,13 @@ namespace Examine.Search
     /// </summary>
     public readonly struct FacetLabel : IFacetLabel
     {
-        private readonly string[] _components;
-
         /// <summary>
         /// Constructor
         /// </summary>
         /// <param name="components">The components of this FacetLabel</param>
         public FacetLabel(string[] components)
         {
-            _components = components;
+            Components = components;
         }
 
         /// <summary>
@@ -26,20 +24,32 @@ public FacetLabel(string[] components)
         /// <param name="components">>The components of this FacetLabel</param>
         public FacetLabel(string dimension, string[] components)
         {
-            _components = new string[1 + components.Length];
-            _components[0] = dimension;
-            Array.Copy(components, 0, _components, 1, components.Length);
+            Components = new string[1 + components.Length];
+            Components[0] = dimension;
+            Array.Copy(components, 0, Components, 1, components.Length);
         }
 
         /// <inheritdoc/>
-        public string[] Components => _components;
+        public string[] Components { get; }
 
         /// <inheritdoc/>
-        public int Length => _components.Length;
+        public int Length => Components.Length;
 
-        // From Lucene.NET
-        public int CompareTo(IFacetLabel other)
+        /// <summary>
+        /// Compares one facet label to another.
+        /// </summary>
+        /// <remarks>
+        /// From Lucene.NET
+        /// </remarks>
+        /// <param name="other"></param>
+        /// <returns></returns>
+        public int CompareTo(IFacetLabel? other)
         {
+            if (other == null)
+            {
+                return 1; // null sorts last
+            }
+
             int len = Length < other.Length ? Length : other.Length;
             for (int i = 0, j = 0; i < len; i++, j++)
             {
@@ -67,11 +77,11 @@ public IFacetLabel Subpath(int length)
                 return new FacetLabel(Components);
             }
 
-            List<string> subpathComponents = new List<string>(length);
+            var subpathComponents = new List<string>(length);
             int index = 0;
-            while (index < length && index < _components.Length)
+            while (index < length && index < Components.Length)
             {
-                subpathComponents.Add(_components[index]);
+                subpathComponents.Add(Components[index]);
                 index++;
             }
             return new FacetLabel(subpathComponents.ToArray());

src/Examine.Core/Search/FacetResult.cs

@@ -23,21 +23,12 @@ public FacetResult(IEnumerable<IFacetValue> values)
         }
 
         /// <inheritdoc/>
-        public IEnumerator<IFacetValue> GetEnumerator()
-        {
-            return _values.GetEnumerator();
-        }
+        public IEnumerator<IFacetValue> GetEnumerator() => _values.GetEnumerator();
 
 #if !NETSTANDARD2_0 && !NETSTANDARD2_1
         [MemberNotNull(nameof(_dictValues))]
 #endif
-        private void SetValuesDictionary()
-        {
-            if(_dictValues == null)
-            {
-                _dictValues = _values.ToDictionary(src => src.Label, src => src);
-            }
-        }
+        private void SetValuesDictionary() => _dictValues ??= _values.ToDictionary(src => src.Label, src => src);
 
         /// <inheritdoc/>
         public IFacetValue? Facet(string label)
@@ -54,9 +45,6 @@ public bool TryGetFacet(string label, out IFacetValue? facetValue)
         }
 
         /// <inheritdoc/>
-        IEnumerator IEnumerable.GetEnumerator()
-        {
-            return GetEnumerator();
-        }
+        IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
     }
 }

src/Examine.Core/SearchResult.cs

@@ -5,7 +5,9 @@
 
 namespace Examine
 {
-    /// <inheritdoc/>
+    /// <summary>
+    /// Represents a search result
+    /// </summary>
     public class SearchResult : ISearchResult
     {
         private OrderedDictionary<string, string>? _fields;

src/Examine.Host/AspNetCoreApplicationIdentifier.cs

@@ -8,12 +8,16 @@ namespace Examine
     public class AspNetCoreApplicationIdentifier : IApplicationIdentifier
     {
         private readonly IServiceProvider _services;
+        private static readonly Lazy<string> _applicationId = new(() => Guid.NewGuid().ToString());
 
         /// <inheritdoc/>
-        public AspNetCoreApplicationIdentifier(IServiceProvider services) => _services = services;
+        public AspNetCoreApplicationIdentifier(IServiceProvider services)
+        {
+            _services = services;
+        }
 
 
         /// <inheritdoc/>
-        public string GetApplicationUniqueIdentifier() => _services.GetApplicationUniqueIdentifier();
+        public string GetApplicationUniqueIdentifier() => _services.GetApplicationUniqueIdentifier() ?? _applicationId.Value;
     }
 }

src/Examine.Host/Examine.csproj

@@ -6,7 +6,6 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
     <Nullable>enable</Nullable>
     <LangVersion>9</LangVersion>
-    <NoWarn>RS0036</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>