Package upgrades - prep for .NET 9 compatibility

LTRData · Sep 14, 2024 · 27fc757 · 27fc757
1 parent 44f88d9
commit 27fc757
Show file tree

Hide file tree

Showing 23 changed files with 68 additions and 97 deletions.
diff --git a/Library/DiscUtils.Core/DiscUtils.Core.csproj b/Library/DiscUtils.Core/DiscUtils.Core.csproj
@@ -1,21 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>Implementation of the ISO, UDF, FAT and NTFS file systems is now fairly stable. VHD, XVA, VMDK and VDI disk formats are implemented, as well as read/write Registry support. The library also includes a simple iSCSI initiator, for accessing disks via iSCSI and an NFS client implementation.</Description>
     <AssemblyTitle>DiscUtils (for .NET and .NET Core), core library that supports parts of DiscUtils</AssemblyTitle>
     <Authors>Kenneth Bell;Quamotion;LordMike;Olof Lagerkvist</Authors>
     <PackageTags>DiscUtils;VHD;VDI;XVA;VMDK;ISO;NTFS;EXT2FS</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Streams\DiscUtils.Streams.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net461`))' &gt;= 0">
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="*" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net5`))' &gt;= 0">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="*" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Core/Internal/Utilities.cs b/Library/DiscUtils.Core/Internal/Utilities.cs
@@ -277,8 +277,8 @@ public static string ResolvePath(string basePath, string path)
 
     public static string MakeRelativePath(string path, string basePath)
     {
-        var pathElements = path.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
-        var basePathElements = basePath.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var pathElements = path.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var basePathElements = basePath.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
 
         if (basePathElements.Length > 0 && basePath[basePath.Length - 1] != Path.DirectorySeparatorChar)
         {

diff --git a/Library/DiscUtils.Core/WindowsSecurity/AccessControl/GenericAce.cs b/Library/DiscUtils.Core/WindowsSecurity/AccessControl/GenericAce.cs
@@ -241,7 +241,7 @@ internal static GenericAce CreateFromSddlForm(ReadOnlySpan<char> sddlForm, ref i
         var count = endPos;
         var elementsStr = sddlForm.Slice(0, count).ToString();
         elementsStr = elementsStr.ToUpperInvariant();
-        var elements = elementsStr.AsMemory().Split(';').ToArray();
+        var elements = elementsStr.AsMemory().TokenEnum(';').ToArray();
         if (elements.Length != 6)
         {
             throw new ArgumentException("Invalid SDDL string.", nameof(sddlForm));

diff --git a/Library/DiscUtils.Fat/DiscUtils.Fat.csproj b/Library/DiscUtils.Fat/DiscUtils.Fat.csproj
@@ -1,22 +1,19 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils FAT filesystem parser</Description>
     <Authors>Kenneth Bell;LordMike;Olof Lagerkvist</Authors>
     <PackageTags>DiscUtils;Filesystem;FAT</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
     <!-- In order to test FileName and other internals in Unit tests-->
     <InternalsVisibleTo Include="LibraryTests" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net5`))' &gt;= 0">
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="*" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
   </ItemGroup>
-
   <ItemGroup Condition="('$(TargetFramework.CompareTo(`net5`))' &lt; 0 And '$(TargetFramework.CompareTo(`net462`))' &gt;= 0) Or '$(TargetFramework.StartsWith(`netstandard`))'">
-    <PackageReference Include="System.Collections.Immutable" Version="*" />
+    <PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Fat/FatFileSystem.cs b/Library/DiscUtils.Fat/FatFileSystem.cs
@@ -956,7 +956,7 @@ public override void CopyFile(string sourceFile, string destinationFile, bool ov
     /// <param name="path">The directory to create.</param>
     public override void CreateDirectory(string path)
     {
-        var pathElements = path.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries);
+        var pathElements = path.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries);
 
         var focusDir = _rootDir;
 
@@ -1735,7 +1735,7 @@ private long GetDirectoryEntry(Directory dir, string path, out Directory parent)
 
     private long GetDirectoryEntry(Directory dir, string path, out Directory parent, out string lastPathName)
     {
-        var pathElements = path.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var pathElements = path.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
         return GetDirectoryEntry(dir, pathElements, 0, out parent, out lastPathName);
     }
 

diff --git a/Library/DiscUtils.Iscsi/LunInfo.cs b/Library/DiscUtils.Iscsi/LunInfo.cs
@@ -140,7 +140,7 @@ public static LunInfo ParseUri(Uri uri)
         var targetInfo = new TargetInfo(targetName,
             [new TargetAddress(address, port, targetGroupTag)]);
 
-        foreach (var queryElem in uri.Query.AsMemory(1).Split('&'))
+        foreach (var queryElem in uri.Query.AsMemory(1).TokenEnum('&'))
         {
             if (queryElem.Span.StartsWith("LUN=".AsSpan(), StringComparison.OrdinalIgnoreCase))
             {

diff --git a/Library/DiscUtils.Iso9660/BuildDirectoryMember.cs b/Library/DiscUtils.Iso9660/BuildDirectoryMember.cs
@@ -107,8 +107,8 @@ private class DirectorySortedComparison : Comparer<BuildDirectoryMember>
     {
         public override int Compare(BuildDirectoryMember x, BuildDirectoryMember y)
         {
-            var xParts = x.Name.AsMemory().Split('.', ';').ToArray();
-            var yParts = y.Name.AsMemory().Split('.', ';').ToArray();
+            var xParts = x.Name.AsMemory().TokenEnum('.', ';').ToArray();
+            var yParts = y.Name.AsMemory().TokenEnum('.', ';').ToArray();
 
             ReadOnlyMemory<char> xPart;
             ReadOnlyMemory<char> yPart;

diff --git a/Library/DiscUtils.Iso9660/CDBuilder.cs b/Library/DiscUtils.Iso9660/CDBuilder.cs
@@ -190,7 +190,7 @@ public void SetBootImage(Stream image, BootDeviceEmulation emulation, int loadSe
     /// </remarks>
     public BuildDirectoryInfo AddDirectory(string name)
     {
-        var nameElements = name.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var nameElements = name.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
         return GetDirectory(nameElements, nameElements.Length, true);
     }
 
@@ -541,7 +541,7 @@ private Stream PatchBootImage(Stream bootImage, uint pvdLba, uint bootImageLba)
     /// <returns>BuildDirectoryMember object representing already added file.</returns>
     public BuildDirectoryMember GetFile(string path)
     {
-        var nameElements = path.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
+        var nameElements = path.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
         var dir = GetDirectory(nameElements, nameElements.Length - 1, true);
 
         var name = nameElements[nameElements.Length - 1].ToString();
@@ -563,7 +563,7 @@ public BuildDirectoryMember GetFile(string path)
 
     private void CheckDirectoryForFilePath(string name, out ReadOnlyMemory<char>[] nameElements, out BuildDirectoryInfo dir)
     {
-        nameElements = name.AsMemory().Split('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
+        nameElements = name.AsMemory().TokenEnum('\\', '/', StringSplitOptions.RemoveEmptyEntries).ToArray();
         dir = GetDirectory(nameElements, nameElements.Length - 1, true);
 
         if (dir.TryGetMember(nameElements[nameElements.Length - 1].ToString(), out _))

diff --git a/Library/DiscUtils.Iso9660/DiscUtils.Iso9660.csproj b/Library/DiscUtils.Iso9660/DiscUtils.Iso9660.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils Iso9660</Description>
-
     <PackageTags>DiscUtils;Optical;Iso9660</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net461`))' &gt;= 0">
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="*" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Net/Dns/DnsClient.cs b/Library/DiscUtils.Net/Dns/DnsClient.cs
@@ -47,7 +47,7 @@ public abstract class DnsClient
 
     internal static string NormalizeDomainName(string name)
     {
-        var labels = name.AsMemory().Split('.', StringSplitOptions.RemoveEmptyEntries);
+        var labels = name.AsMemory().TokenEnum('.', StringSplitOptions.RemoveEmptyEntries);
 
         return $"{string.Join(".", labels)}.";
     }

diff --git a/Library/DiscUtils.Nfs/DiscUtils.Nfs.csproj b/Library/DiscUtils.Nfs/DiscUtils.Nfs.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils Nfs</Description>
-
     <PackageTags>DiscUtils;Nfs</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net461`))' &gt;= 0">
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="*" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Ntfs/DiscUtils.Ntfs.csproj b/Library/DiscUtils.Ntfs/DiscUtils.Ntfs.csproj
@@ -1,19 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils NTFS filesystem parser</Description>
     <Authors>Kenneth Bell;LordMike;Olof Lagerkvist</Authors>
     <PackageTags>DiscUtils;Filesystem;NTFS</PackageTags>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="*" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net461`))' &gt;= 0">
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="*" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.OpticalDiscSharing/DiscContentBuffer.cs b/Library/DiscUtils.OpticalDiscSharing/DiscContentBuffer.cs
@@ -173,13 +173,13 @@ private static Dictionary<string, string> ParseAuthenticationHeader(string heade
     {
         var result = new Dictionary<string, string>();
 
-        var elements = header.AsMemory().Split(' ').ToArray();
+        var elements = header.AsMemory().TokenEnum(' ').ToArray();
 
         authMethod = elements[0].ToString();
 
         for (var i = 1; i < elements.Length; ++i)
         {
-            var nvPair = elements[i].Split('=', StringSplitOptions.None);
+            var nvPair = elements[i].TokenEnum('=', StringSplitOptions.None);
             result.Add(nvPair.ElementAt(0).ToString(), nvPair.ElementAt(1).Span.Trim('\"').ToString());
         }
 

diff --git a/Library/DiscUtils.OpticalDiscSharing/OpticalDiscService.cs b/Library/DiscUtils.OpticalDiscSharing/OpticalDiscService.cs
@@ -242,11 +242,11 @@ private Dictionary<string, string> GetParams(string section)
         if (_instance.Parameters.TryGetValue(section, out var data))
         {
             var asString = Encoding.ASCII.GetString(data);
-            var nvPairs = asString.AsSpan().Split(',');
+            var nvPairs = asString.AsSpan().TokenEnum(',');
 
             foreach (var nvPair in nvPairs)
             {
-                var parts = nvPair.Split('=');
+                var parts = nvPair.TokenEnum('=');
                 result[parts.First().ToString()] = parts.ElementAt(1).ToString();
             }
         }

diff --git a/Library/DiscUtils.Registry/DiscUtils.Registry.csproj b/Library/DiscUtils.Registry/DiscUtils.Registry.csproj
@@ -1,17 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils Registry</Description>
-
     <PackageTags>DiscUtils;Registry</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
     <ProjectReference Include="..\DiscUtils.Streams\DiscUtils.Streams.csproj" />
   </ItemGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.Memory" Version="*" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Streams/DiscUtils.Streams.csproj b/Library/DiscUtils.Streams/DiscUtils.Streams.csproj
@@ -1,20 +1,17 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils Streams</Description>
     <Authors>Kenneth Bell;LordMike;Bianco Veigel;Olof Lagerkvist</Authors>
     <PackageTags>DiscUtils;Streams</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.Memory" Version="*" />
+    <PackageReference Include="System.Memory" Version="4.5.5" />
     <PackageReference Include="System.Security.Cryptography.Algorithms" Version="4.3.1" />
     <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-    <PackageReference Include="LTRData.Extensions" Version="1.0.10" />
+    <PackageReference Include="LTRData.Extensions" Version="1.0.11" />
   </ItemGroup>
-
   <ItemGroup Condition="'$(TargetFramework.CompareTo(`net461`))' &gt;= 0">
-    <PackageReference Include="Microsoft.Bcl.HashCode" Version="*" />
+    <PackageReference Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Vhd/DiscUtils.Vhd.csproj b/Library/DiscUtils.Vhd/DiscUtils.Vhd.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils VHD</Description>
-
     <PackageTags>DiscUtils;VHD</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="*" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Vhdx/DiscUtils.Vhdx.csproj b/Library/DiscUtils.Vhdx/DiscUtils.Vhdx.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils VHDX</Description>
-
     <PackageTags>DiscUtils;VHDX</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="*" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Vmdk/DescriptorFileEntry.cs b/Library/DiscUtils.Vmdk/DescriptorFileEntry.cs
@@ -45,7 +45,7 @@ public DescriptorFileEntry(string key, string value, DescriptorFileEntryType typ
 
     public static DescriptorFileEntry Parse(string value)
     {
-        var parts = value.AsMemory().Split('=').Take(2).ToArray();
+        var parts = value.AsMemory().TokenEnum('=').Take(2).ToArray();
 
         for (var i = 0; i < parts.Length; ++i)
         {

diff --git a/Library/DiscUtils.Vmdk/DiscUtils.Vmdk.csproj b/Library/DiscUtils.Vmdk/DiscUtils.Vmdk.csproj
@@ -1,16 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <Description>DiscUtils VMDK</Description>
-
     <PackageTags>DiscUtils;VMDK</PackageTags>
   </PropertyGroup>
-
   <ItemGroup>
-    <PackageReference Include="System.ValueTuple" Version="*" />
+    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
   </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DiscUtils.Core\DiscUtils.Core.csproj" />
   </ItemGroup>
-
-</Project>
+</Project>
diff --git a/Library/DiscUtils.Wim/WimFileSystem.cs b/Library/DiscUtils.Wim/WimFileSystem.cs
@@ -593,7 +593,7 @@ protected override void Dispose(bool disposing)
 
     private static void SplitFileName(string path, out string filePart, out string altStreamPart)
     {
-        var streamSepPos = path.IndexOf(":", StringComparison.Ordinal);
+        var streamSepPos = path.IndexOf(':');
 
         if (streamSepPos >= 0)
         {
@@ -673,7 +673,7 @@ private DirectoryEntry GetEntry(string path)
             path = Path.DirectorySeparatorChar + path;
         }
 
-        return GetEntry(GetDirectory(0), path.AsMemory().Split('/', '\\').ToArray());
+        return GetEntry(GetDirectory(0), path.AsMemory().TokenEnum('/', '\\').ToArray());
     }
 
     private DirectoryEntry GetEntry(List<DirectoryEntry> dir, ReadOnlyMemory<char>[] path)