Upgraded to J2N 1.0.0-beta-0001

Author: NightOwl888

build/dependencies.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Label="NuGet Package Reference Versions">
-    <J2NPackageReferenceVersion>1.0.0-alpha-0030</J2NPackageReferenceVersion>
+    <J2NPackageReferenceVersion>1.0.0-beta-0001</J2NPackageReferenceVersion>
     <MicrosoftCSharpPackageReferenceVersion>4.4.0</MicrosoftCSharpPackageReferenceVersion>
     <MicrosoftNETTestSdkPackageReferenceVersion>16.1.1</MicrosoftNETTestSdkPackageReferenceVersion>
     <NerdBankGitVersioningPackageReferenceVersion>[2.3.183]</NerdBankGitVersioningPackageReferenceVersion>

src/ICU4N.Collation/Impl/Coll/CollationDataBuilder.cs

@@ -1380,8 +1380,8 @@ private void BuildFastLatinTable(CollationData data)
                 char[] header = fastLatinBuilder.GetHeader();
                 char[] table = fastLatinBuilder.GetTable();
                 if (base_ != null &&
-                        Arrays.Equals(header, base_.fastLatinTableHeader) &&
-                        Arrays.Equals(table, base_.FastLatinTable))
+                        ArrayEqualityComparer<char>.OneDimensional.Equals(header, base_.fastLatinTableHeader) &&
+                        ArrayEqualityComparer<char>.OneDimensional.Equals(table, base_.FastLatinTable))
                 {
                     // Same fast Latin table as in the base, use that one instead.
                     fastLatinBuilder = null;

src/ICU4N.Collation/Impl/Coll/CollationDataReader.cs

@@ -5,7 +5,6 @@
 using J2N.IO;
 using J2N.Numerics;
 using System.Diagnostics;
-using Arrays = J2N.Collections.Arrays;
 
 namespace ICU4N.Impl.Coll
 {

src/ICU4N.Collation/Impl/Coll/CollationSettings.cs

@@ -106,7 +106,7 @@ public override bool Equals(object other)
             CollationSettings o = (CollationSettings)other;
             if (options != o.options) { return false; }
             if ((options & AlternateMask) != 0 && variableTop != o.variableTop) { return false; }
-            if (!Arrays.Equals(reorderCodes, o.reorderCodes)) { return false; }
+            if (!ArrayEqualityComparer<int>.OneDimensional.Equals(reorderCodes, o.reorderCodes)) { return false; }
             return true;
         }
 

src/ICU4N.Collation/Text/RuleBasedCollator.cs

@@ -935,7 +935,7 @@ public override void SetReorderCodes(params int[] order)
             }
             if (length == 0 ?
                     settings.ReadOnly.ReorderCodes.Length == 0 :
-                    Arrays.Equals(order, settings.ReadOnly.ReorderCodes))
+                    ArrayEqualityComparer<int>.OneDimensional.Equals(order, settings.ReadOnly.ReorderCodes))
             {
                 return;
             }

src/ICU4N.Transliterator/Text/TransliteratorParser.cs

@@ -1276,7 +1276,7 @@ private void ParseRules(RuleBody ruleArray, TransliterationDirection dir)
 
                 // ICU4N: Catch blocks are using ArgumentException, and we need to 
                 // aggregate our error messages in order for the tests to pass.
-                throw new ArgumentException(CollectionUtil.ToString(errors));
+                throw new ArgumentException(string.Format(StringFormatter.CurrentCulture, "{0}", errors));
             }
         }
 

src/ICU4N/Impl/IntTrie.cs

@@ -226,7 +226,7 @@ public override bool Equals(Object other)
             {
                 Int32Trie othertrie = (Int32Trie)other;
                 if (m_initialValue_ != othertrie.m_initialValue_
-                    || !Arrays.Equals(m_data_, othertrie.m_data_))
+                    || !ArrayEqualityComparer<int>.OneDimensional.Equals(m_data_, othertrie.m_data_))
                 {
                     return false;
                 }

src/ICU4N/Impl/IntTrieBuilder.cs

@@ -93,7 +93,7 @@ public Int32TrieBuilder(int[] aliasdata, int maxdatalength,
 
             m_dataLength_ = j;
             // reset the initially allocated blocks to the initial value
-            Arrays.Fill(m_data_, 0, m_dataLength_, initialvalue);
+            m_data_.Fill(0, m_dataLength_ - 0, initialvalue); // ICU4N: Corrected length
             m_initialValue_ = initialvalue;
             m_leadUnitValue_ = leadunitvalue;
             m_dataCapacity_ = maxdatalength;

src/ICU4N/Impl/Relation.cs

@@ -1,6 +1,8 @@
 using ICU4N.Support.Collections;
 using ICU4N.Util;
 using J2N.Collections;
+using J2N.Collections.Generic;
+using J2N.Text;
 using System;
 using System.Collections;
 using System.Collections.Generic;
@@ -34,21 +36,31 @@ public static Relation<TKey, TValue> Of<TKey, TValue>(IDictionary<TKey, ISet<TVa
     /// <typeparam name="TKey">Type of key.</typeparam>
     /// <typeparam name="TValue">Type of value.</typeparam>
     /// <author>medavis</author>
-    public class Relation<TKey, TValue> : IFreezable<Relation<TKey, TValue>>, IEnumerable<KeyValuePair<TKey, TValue>>
+    public class Relation<TKey, TValue> : IFreezable<Relation<TKey, TValue>>, IEnumerable<KeyValuePair<TKey, TValue>>, IStructuralEquatable
         where TValue : class // ICU4N specific - using only reference types so we don't have to change from null to default(TValue)
     {
         private IDictionary<TKey, ISet<TValue>> data;
 
         ConstructorInfo setCreator;
         object[] setComparerParam;
 
+        private readonly DictionaryEqualityComparer<TKey, ISet<TValue>> structuralEqualityComparer;
+
         public Relation(IDictionary<TKey, ISet<TValue>> map, Type setCreator)
-            : this(map, setCreator, null)
-        {
-        }
+            : this(map, setCreator, null, DictionaryEqualityComparer<TKey, ISet<TValue>>.Aggressive) // ICU4N TODO: Factor out Aggressive mode
+        { }
+
+        public Relation(IDictionary<TKey, ISet<TValue>> map, Type setCreator, DictionaryEqualityComparer<TKey, ISet<TValue>> structuralEqualityComparer)
+            : this(map, setCreator, null, structuralEqualityComparer)
+        { }
 
         public Relation(IDictionary<TKey, ISet<TValue>> map, Type setCreator, IComparer<TValue> setComparator)
+            : this(map, setCreator, null, DictionaryEqualityComparer<TKey, ISet<TValue>>.Aggressive) // ICU4N TODO: Factor out Aggressive mode
+        { }
+
+        public Relation(IDictionary<TKey, ISet<TValue>> map, Type setCreator, IComparer<TValue> setComparator, DictionaryEqualityComparer<TKey, ISet<TValue>> structuralEqualityComparer)
         {
+            this.structuralEqualityComparer = structuralEqualityComparer ?? throw new ArgumentNullException(nameof(structuralEqualityComparer));
             try
             {
                 setComparerParam = setComparator == null ? null : new object[] { setComparator };
@@ -178,9 +190,9 @@ public override bool Equals(object o)
         {
             if (o == null)
                 return false;
-            if (o.GetType() != this.GetType())
-                return false;
-            return data.Equals(((Relation<TKey, TValue>)o).data);
+            if (o is Relation<TKey, TValue> otherRelation)
+                return structuralEqualityComparer.Equals(this.data, otherRelation.data);
+            return false;
         }
 
         //  public V get(Object key) {
@@ -202,9 +214,25 @@ public ISet<TValue> Get(TKey key)
 
         public override int GetHashCode()
         {
-            return CollectionUtil.GetHashCode(data);
+            return structuralEqualityComparer.GetHashCode(data);
+        }
+
+        #region IStructualEquatable Members
+
+        public bool Equals(object other, IEqualityComparer comparer)
+        {
+            if (other is Relation<TKey, TValue> otherRelation)
+                return structuralEqualityComparer.Equals(this.data, otherRelation.data);
+            return false;
+        }
+
+        public int GetHashCode(IEqualityComparer comparer)
+        {
+            return structuralEqualityComparer.GetHashCode(data);
         }
 
+        #endregion
+
         //public virtual bool IsEmpty // ICU4N specific - removed because this is not .NET-like
         //{
         //    get { return data.Count == 0; }
@@ -347,7 +375,7 @@ public virtual C GetValues<C>(C result)
 
         public override string ToString()
         {
-            return CollectionUtil.ToString(data);
+            return string.Format(StringFormatter.CurrentCulture, "{0}", data);
         }
 
         // ICU4N specific - SimpleEntry class not needed, since we have implemented IEnumerator.

src/ICU4N/Impl/Trie.cs

@@ -110,7 +110,7 @@ public override bool Equals(object other)
             return m_isLatin1Linear_ == othertrie.m_isLatin1Linear_
                    && m_options_ == othertrie.m_options_
                    && m_dataLength == othertrie.m_dataLength
-                   && Arrays.Equals(m_index, othertrie.m_index);
+                   && ArrayEqualityComparer<char>.OneDimensional.Equals(m_index, othertrie.m_index);
         }
 
         public override int GetHashCode()