diff --git a/Directory.Packages.props b/Directory.Packages.props
index 5ca679b7..888c3f78 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -10,6 +10,7 @@
+
diff --git a/OpenMcdf/OpenMcdf.csproj b/OpenMcdf/OpenMcdf.csproj
index 2580363b..e97e3dfd 100644
--- a/OpenMcdf/OpenMcdf.csproj
+++ b/OpenMcdf/OpenMcdf.csproj
@@ -17,6 +17,7 @@
+
diff --git a/OpenMcdf/System/Index.cs b/OpenMcdf/System/Index.cs
deleted file mode 100644
index e99045e8..00000000
--- a/OpenMcdf/System/Index.cs
+++ /dev/null
@@ -1,166 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
-namespace System;
-
-/// Represent a type can be used to index a collection either from the start or the end.
-///
-/// Index is used by the C# compiler to support the new index syntax
-///
-/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 } ;
-/// int lastElement = someArray[^1]; // lastElement = 5
-///
-///
-#if SYSTEM_PRIVATE_CORELIB
-public
-#else
-internal
-#endif
-readonly struct Index : IEquatable
-{
- private readonly int _value;
-
- /// Construct an Index using a value and indicating if the index is from the start or from the end.
- /// The index value. it has to be zero or positive number.
- /// Indicating if the index is from the start or from the end.
- ///
- /// If the Index constructed from the end, index value 1 means pointing at the last element and index value 0 means pointing at beyond last element.
- ///
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public Index(int value, bool fromEnd = false)
- {
- if (value < 0)
- {
- ThrowValueArgumentOutOfRange_NeedNonNegNumException();
- }
-
- if (fromEnd)
- _value = ~value;
- else
- _value = value;
- }
-
- // The following private constructors mainly created for perf reason to avoid the checks
- private Index(int value)
- {
- _value = value;
- }
-
- /// Create an Index pointing at first element.
- public static Index Start => new Index(0);
-
- /// Create an Index pointing at beyond last element.
- public static Index End => new Index(~0);
-
- /// Create an Index from the start at the position indicated by the value.
- /// The index value from the start.
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static Index FromStart(int value)
- {
- if (value < 0)
- {
- ThrowValueArgumentOutOfRange_NeedNonNegNumException();
- }
-
- return new Index(value);
- }
-
- /// Create an Index from the end at the position indicated by the value.
- /// The index value from the end.
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public static Index FromEnd(int value)
- {
- if (value < 0)
- {
- ThrowValueArgumentOutOfRange_NeedNonNegNumException();
- }
-
- return new Index(~value);
- }
-
- /// Returns the index value.
- public int Value
- {
- get
- {
- if (_value < 0)
- return ~_value;
- else
- return _value;
- }
- }
-
- /// Indicates whether the index is from the start or the end.
- public bool IsFromEnd => _value < 0;
-
- /// Calculate the offset from the start using the giving collection length.
- /// The length of the collection that the Index will be used with. length has to be a positive value
- ///
- /// For performance reason, we don't validate the input length parameter and the returned offset value against negative values.
- /// we don't validate either the returned offset is greater than the input length.
- /// It is expected Index will be used with collections which always have non negative length/count. If the returned offset is negative and
- /// then used to index a collection will get out of range exception which will be same affect as the validation.
- ///
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public int GetOffset(int length)
- {
- int offset = _value;
- if (IsFromEnd)
- {
- // offset = length - (~value)
- // offset = length + (~(~value) + 1)
- // offset = length + value + 1
-
- offset += length + 1;
- }
- return offset;
- }
-
- /// Indicates whether the current Index object is equal to another object of the same type.
- /// An object to compare with this object
- public override bool Equals([NotNullWhen(true)] object? value) => value is Index && _value == ((Index)value)._value;
-
- /// Indicates whether the current Index object is equal to another Index object.
- /// An object to compare with this object
- public bool Equals(Index other) => _value == other._value;
-
- /// Returns the hash code for this instance.
- public override int GetHashCode() => _value;
-
- /// Converts integer number to an Index.
- public static implicit operator Index(int value) => FromStart(value);
-
- /// Converts the value of the current Index object to its equivalent string representation.
- public override string ToString()
- {
- if (IsFromEnd)
- return ToStringFromEnd();
-
- return ((uint)Value).ToString();
- }
-
- private static void ThrowValueArgumentOutOfRange_NeedNonNegNumException()
- {
-#if SYSTEM_PRIVATE_CORELIB
- throw new ArgumentOutOfRangeException("value", SR.ArgumentOutOfRange_NeedNonNegNum);
-#else
- throw new ArgumentOutOfRangeException("value", "value must be non-negative");
-#endif
- }
-
- private string ToStringFromEnd()
- {
-#if (!NETSTANDARD2_0 && !NETFRAMEWORK)
- Span span = stackalloc char[11]; // 1 for ^ and 10 for longest possible uint value
- bool formatted = ((uint)Value).TryFormat(span.Slice(1), out int charsWritten);
- Debug.Assert(formatted);
- span[0] = '^';
- return new string(span.Slice(0, charsWritten + 1));
-#else
- return '^' + Value.ToString();
-#endif
- }
-}
\ No newline at end of file
diff --git a/OpenMcdf/System/Range.cs b/OpenMcdf/System/Range.cs
deleted file mode 100644
index 7cb53760..00000000
--- a/OpenMcdf/System/Range.cs
+++ /dev/null
@@ -1,127 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-
-using System.Diagnostics.CodeAnalysis;
-using System.Runtime.CompilerServices;
-
-#if NETSTANDARD2_0 || NETFRAMEWORK
-#endif
-
-namespace System;
-
-/// Represent a range has start and end indexes.
-///
-/// Range is used by the C# compiler to support the range syntax.
-///
-/// int[] someArray = new int[5] { 1, 2, 3, 4, 5 };
-/// int[] subArray1 = someArray[0..2]; // { 1, 2 }
-/// int[] subArray2 = someArray[1..^0]; // { 2, 3, 4, 5 }
-///
-///
-#if SYSTEM_PRIVATE_CORELIB
-public
-#else
-internal
-#endif
-readonly struct Range : IEquatable
-{
- /// Represent the inclusive start index of the Range.
- public Index Start { get; }
-
- /// Represent the exclusive end index of the Range.
- public Index End { get; }
-
- /// Construct a Range object using the start and end indexes.
- /// Represent the inclusive start index of the range.
- /// Represent the exclusive end index of the range.
- public Range(Index start, Index end)
- {
- Start = start;
- End = end;
- }
-
- /// Indicates whether the current Range object is equal to another object of the same type.
- /// An object to compare with this object
- public override bool Equals([NotNullWhen(true)] object? value) =>
- value is Range r &&
- r.Start.Equals(Start) &&
- r.End.Equals(End);
-
- /// Indicates whether the current Range object is equal to another Range object.
- /// An object to compare with this object
- public bool Equals(Range other) => other.Start.Equals(Start) && other.End.Equals(End);
-
- /// Returns the hash code for this instance.
- public override int GetHashCode()
- {
- return HashCode.Combine(Start.GetHashCode(), End.GetHashCode());
- }
-
- /// Converts the value of the current Range object to its equivalent string representation.
- public override string ToString()
- {
-#if (!NETSTANDARD2_0 && !NETFRAMEWORK)
- Span span = stackalloc char[2 + (2 * 11)]; // 2 for "..", then for each index 1 for '^' and 10 for longest possible uint
- int pos = 0;
-
- if (Start.IsFromEnd)
- {
- span[0] = '^';
- pos = 1;
- }
- bool formatted = ((uint)Start.Value).TryFormat(span.Slice(pos), out int charsWritten);
- Debug.Assert(formatted);
- pos += charsWritten;
-
- span[pos++] = '.';
- span[pos++] = '.';
-
- if (End.IsFromEnd)
- {
- span[pos++] = '^';
- }
- formatted = ((uint)End.Value).TryFormat(span.Slice(pos), out charsWritten);
- Debug.Assert(formatted);
- pos += charsWritten;
-
- return new string(span.Slice(0, pos));
-#else
- return Start.ToString() + ".." + End.ToString();
-#endif
- }
-
- /// Create a Range object starting from start index to the end of the collection.
- public static Range StartAt(Index start) => new Range(start, Index.End);
-
- /// Create a Range object starting from first element in the collection to the end Index.
- public static Range EndAt(Index end) => new Range(Index.Start, end);
-
- /// Create a Range object starting from first element to the end.
- public static Range All => new Range(Index.Start, Index.End);
-
- /// Calculate the start offset and length of range object using a collection length.
- /// The length of the collection that the range will be used with. length has to be a positive value.
- ///
- /// For performance reason, we don't validate the input length parameter against negative values.
- /// It is expected Range will be used with collections which always have non negative length/count.
- /// We validate the range is inside the length scope though.
- ///
- [MethodImpl(MethodImplOptions.AggressiveInlining)]
- public (int Offset, int Length) GetOffsetAndLength(int length)
- {
- int start = Start.GetOffset(length);
- int end = End.GetOffset(length);
-
- if ((uint)end > (uint)length || (uint)start > (uint)end)
- {
- ThrowArgumentOutOfRangeException();
- }
-
- return (start, end - start);
- }
-
- private static void ThrowArgumentOutOfRangeException()
- {
- throw new ArgumentOutOfRangeException("length");
- }
-}
\ No newline at end of file