fix: IO 测试 net471 兼容(续)：修复 IndexOf/EndsWith/Replace/StringComparison、Split/StringSplitOptions、await using(IAsyncDisposable)，补 System.Runtime.CompilerServices.Unsafe

Author: hueifeng

Directory.Packages.props

@@ -29,6 +29,7 @@
     <PackageVersion Include="System.Runtime.Loader" Version="4.3.0" />
     <!-- netstandard2.0 polyfills for Magicodes.IE.IO -->
     <PackageVersion Include="System.Memory" Version="4.5.5" />
+    <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
     <PackageVersion Include="Microsoft.Bcl.AsyncInterfaces" Version="8.0.0" />
     <PackageVersion Include="PolySharp" Version="1.15.0" />
     <!-- Transitive CVE overrides (Stage 2 Step 6): see Excel.NPOI.csproj for context.

tests/Magicodes.IE.IO.Tests/Magicodes.IE.IO.Tests.csproj

@@ -28,6 +28,7 @@
 
   <ItemGroup>
     <PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'net471'" />
+    <PackageReference Include="System.Runtime.CompilerServices.Unsafe" Condition="'$(TargetFramework)' == 'net471'" />
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies.net471" Condition="'$(TargetFramework)' == 'net471'" PrivateAssets="all" />
   </ItemGroup>
 

tests/Magicodes.IE.IO.Tests/XlsxIO_EdgeCases_Tests.cs

@@ -201,8 +201,8 @@ async Task<byte[]> Async()
         [Fact]
         public async Task CompleteAsync_FailureIsFaultedAndCannotResume()
         {
-            await using var output = new XlsxIO_TestSupport.ThrowOnAsyncWriteStream();
-            await using var writer = new XlsxWriter(output, "Sheet1");
+            using var output = new XlsxIO_TestSupport.ThrowOnAsyncWriteStream();
+            using var writer = new XlsxWriter(output, "Sheet1");
             writer.WriteHeader(XlsxIO_TestSupport.MakeCols());
             var first = await Should.ThrowAsync<IOException>(() => writer.CompleteAsync());
             var second = await Should.ThrowAsync<IOException>(() => writer.CompleteAsync());

tests/Magicodes.IE.IO.Tests/XlsxIO_Features_Tests.cs

@@ -440,7 +440,8 @@ public async Task SetOutline_AppearsInSheetFormatPr()
             var xml = XlsxIO_TestSupport.ReadEntry(ms.ToArray(), "xl/worksheets/sheet1.xml");
             xml.ShouldContain("summaryBelow=\"0\"");
             xml.ShouldContain("summaryRight=\"0\"");
-            xml.IndexOf("<sheetPr", StringComparison.Ordinal).ShouldBeLessThan(xml.IndexOf("<sheetViews", StringComparison.Ordinal));
+            System.Globalization.CultureInfo.InvariantCulture.CompareInfo.IndexOf(xml, "<sheetPr", System.Globalization.CompareOptions.Ordinal)
+                .ShouldBeLessThan(System.Globalization.CultureInfo.InvariantCulture.CompareInfo.IndexOf(xml, "<sheetViews", System.Globalization.CompareOptions.Ordinal));
         }
 
         [Fact]
@@ -680,8 +681,9 @@ public void SheetProtection_PrecedesAutoFilterInWorksheetXml()
             }
 
             var xml = XlsxIO_TestSupport.ReadEntry(ms.ToArray(), "xl/worksheets/sheet1.xml");
-            xml.IndexOf("<sheetProtection", StringComparison.Ordinal).ShouldBeLessThan(
-                xml.IndexOf("<autoFilter", StringComparison.Ordinal));
+            System.Globalization.CultureInfo.InvariantCulture.CompareInfo.IndexOf(xml, "<sheetProtection", System.Globalization.CompareOptions.Ordinal)
+                .ShouldBeLessThan(
+                    System.Globalization.CultureInfo.InvariantCulture.CompareInfo.IndexOf(xml, "<autoFilter", System.Globalization.CompareOptions.Ordinal));
         }
 
         [Fact]

tests/Magicodes.IE.IO.Tests/XlsxIO_Styles_Tests.cs

@@ -206,7 +206,7 @@ public async Task EveryCell_HasRAttribute_RequiredBySpec()
                 new OrderDto { OrderNo = "A2", Amount = 2m, CreatedAt = new DateTime(2024, 1, 2) },
             });
             var xml = XlsxIO_TestSupport.ReadEntry(bytes, "xl/worksheets/sheet1.xml");
-            int cellCount = xml.Split("<c ", StringSplitOptions.RemoveEmptyEntries).Length - 1;
+            int cellCount = xml.Split(new[] { "<c " }, StringSplitOptions.RemoveEmptyEntries).Length - 1;
             int cellsWithR = System.Text.RegularExpressions.Regex.Matches(xml, "<c r=\"[A-Z]+\\d+\"").Count;
             cellCount.ShouldBe(cellsWithR, $"每个 <c> 都需要 r=\"A1\" — 缺 {cellCount - cellsWithR} 个");
         }

tests/Magicodes.IE.IO.Tests/XlsxIO_TestSupport.cs

@@ -274,8 +274,8 @@ public static void AssertWellFormedXlsx(byte[] bytes)
             }
             foreach (var entry in zip.Entries)
             {
-                if (!entry.FullName.EndsWith(".xml", StringComparison.OrdinalIgnoreCase)
-                    && !entry.FullName.EndsWith(".rels", StringComparison.OrdinalIgnoreCase)) continue;
+                if (!entry.FullName.EndsWith(".xml")
+                    && !entry.FullName.EndsWith(".rels")) continue;
                 using var es = entry.Open();
                 using var sr = new StreamReader(es);
                 var xml = sr.ReadToEnd();
@@ -287,11 +287,11 @@ public static void AssertWellFormedXlsx(byte[] bytes)
 
         public static void AssertPackageGraph(ZipArchive zip)
         {
-            foreach (var relsEntry in zip.Entries.Where(e => e.FullName.EndsWith(".rels", StringComparison.OrdinalIgnoreCase)))
+            foreach (var relsEntry in zip.Entries.Where(e => e.FullName.EndsWith(".rels")))
             {
                 string sourcePart = relsEntry.FullName == "_rels/.rels"
                     ? ""
-                    : relsEntry.FullName.Substring(0, relsEntry.FullName.Length - ".rels".Length).Replace("/_rels/", "/", StringComparison.Ordinal);
+                    : relsEntry.FullName.Substring(0, relsEntry.FullName.Length - ".rels".Length).Replace("/_rels/", "/");
                 var doc = new XmlDocument { XmlResolver = null };
                 using (var stream = relsEntry.Open()) doc.Load(stream);
                 var ns = new XmlNamespaceManager(doc.NameTable);