Update deps, slnx and central package management

xoofx · xoofx · commit 507a2e955c65 · 2026-04-02T21:25:19.000+02:00
diff --git a/src/Directory.Packages.props b/src/Directory.Packages.props
@@ -2,16 +2,18 @@
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
+    <CentralPackageFloatingVersionsEnabled>true</CentralPackageFloatingVersionsEnabled>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="MinVer" Version="6.0.0" />
-    <PackageVersion Include="MSTest" Version="3.6.0" />
+    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.11" />
+    <PackageVersion Include="MinVer" Version="7.0.0" />
+    <PackageVersion Include="MSTest" Version="4.1.0" />
     <PackageVersion Include="SuperluminalPerf" Version="1.3.0" />
-    <PackageVersion Include="System.Text.Encoding.CodePages" Version="8.0.0" />
-    <PackageVersion Include="Verify.DiffPlex" Version="3.1.0" />
-    <PackageVersion Include="Verify.MSTest" Version="26.6.0" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="CppAst.CodeGen" Version="0.20.0" />
+    <PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.5" />
+    <PackageVersion Include="Verify.DiffPlex" Version="3.1.2" />
+    <PackageVersion Include="Verify.MSTest" Version="31.14.0" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="10.0.201" />
+    <PackageVersion Include="CppAst.CodeGen" Version="0.27.0" />
     <PackageVersion Include="Iced" Version="1.21.0" />
     <PackageVersion Include="Mono.Options" Version="6.12.0.148" />
   </ItemGroup>
diff --git a/src/LibObjectFile.Bench/LibObjectFile.Bench.csproj b/src/LibObjectFile.Bench/LibObjectFile.Bench.csproj
@@ -2,13 +2,14 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="JetBrains.Profiler.Api" />
     <PackageReference Include="SuperluminalPerf" />
   </ItemGroup>
 
diff --git a/src/LibObjectFile.Bench/Program.cs b/src/LibObjectFile.Bench/Program.cs
@@ -3,6 +3,7 @@
 // See the license.txt file in the project root for more information.
 
 using System.Diagnostics;
+using JetBrains.Profiler.Api;
 using LibObjectFile.Elf;
 
 namespace LibObjectFile.Bench;
@@ -11,6 +12,9 @@ internal class Program
 {
     static void Main(string[] args)
     {
+        //Console.WriteLine($"Press enter to start benchmarking - pid: {Process.GetCurrentProcess().Id}");
+        //Console.ReadLine();
+
         Console.WriteLine("Loading files into memory");
         var clock = Stopwatch.StartNew();
         var streams = new List<MemoryStream>();
@@ -34,12 +38,14 @@ static void Main(string[] args)
 
         clock.Stop();
         Console.WriteLine($"End reading in {clock.Elapsed.TotalMilliseconds}ms");
-        Console.ReadLine();
-
+        //Console.ReadLine();
+        //MeasureProfiler.StartCollectingData();
+        //MeasureProfiler.StartCollectingData();
         Console.WriteLine("Processing");
         var memoryStream = new MemoryStream(biggestCapacity);
         clock.Restart();
         //SuperluminalPerf.Initialize();
+        //MeasureProfiler.StartCollectingData("Loading");
         for (int i = 0; i < 10; i++)
         {
             //SuperluminalPerf.BeginEvent($"Round{i}");
@@ -52,6 +58,7 @@ static void Main(string[] args)
             }
             //SuperluminalPerf.EndEvent();
         }
+        //MeasureProfiler.SaveData();
         clock.Stop();
         Console.WriteLine($"{clock.Elapsed.TotalMilliseconds}ms");
     }
diff --git a/src/LibObjectFile.CodeGen/LibObjectFile.CodeGen.csproj b/src/LibObjectFile.CodeGen/LibObjectFile.CodeGen.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
     <PropertyGroup>
-      <TargetFramework>net8.0</TargetFramework>
+      <TargetFramework>net10.0</TargetFramework>
       <OutputType>Exe</OutputType>
       <IsPackable>false</IsPackable>
       <RuntimeIdentifier Condition="'$(RuntimeIdentifier)' == '' AND '$(PackAsTool)' != 'true'">$(NETCoreSdkRuntimeIdentifier)</RuntimeIdentifier>
diff --git a/src/LibObjectFile.Tests/Dwarf/DwarfTests.cs b/src/LibObjectFile.Tests/Dwarf/DwarfTests.cs
@@ -14,7 +14,7 @@ namespace LibObjectFile.Tests.Dwarf;
 [TestClass]
 public class DwarfTests : ElfTestBase
 {
-    [DataTestMethod]
+    [TestMethod]
     [DataRow(0UL)]
     [DataRow(1UL)]
     [DataRow(50UL)]
@@ -39,7 +39,7 @@ public void TestLEB128(ulong value)
         Assert.AreEqual(value, readbackValue);
     }
 
-    [DataTestMethod]
+    [TestMethod]
     [DataRow(0L)]
     [DataRow(1L)]
     [DataRow(50L)]
diff --git a/src/LibObjectFile.Tests/Elf/ElfSimpleTests.cs b/src/LibObjectFile.Tests/Elf/ElfSimpleTests.cs
@@ -17,8 +17,8 @@ namespace LibObjectFile.Tests.Elf;
 [TestClass]
 public class ElfSimpleTests : ElfTestBase
 {
-    [DataTestMethod]
-    [DynamicData(nameof(GetLinuxBins), DynamicDataSourceType.Method)]
+    [TestMethod]
+    [DynamicData(nameof(GetLinuxBins))]
     public void TestLinuxFile(string file)
     {
         if (string.IsNullOrEmpty(file))
@@ -526,7 +526,7 @@ public void TestManySections()
         }
     }
 
-    [DataTestMethod]
+    [TestMethod]
     [DataRow("helloworld")]
     [DataRow("libstdc++.so")]
     [DataRow("helloworld_debug")]
diff --git a/src/LibObjectFile.Tests/IO/TestBatchDataReaderWriter.cs b/src/LibObjectFile.Tests/IO/TestBatchDataReaderWriter.cs
@@ -16,7 +16,7 @@ namespace LibObjectFile.Tests.IO;
 [TestClass]
 public class TestBatchDataReaderWriter
 {
-    [DataTestMethod]
+    [TestMethod]
     [DataRow(0)]
     [DataRow(1)]
     [DataRow(100)]
@@ -39,7 +39,7 @@ public void TestRead(int count)
         Assert.AreEqual(count, i);
     }
 
-    [DataTestMethod]
+    [TestMethod]
     [DataRow(0)]
     [DataRow(1)]
     [DataRow(100)]
diff --git a/src/LibObjectFile.Tests/LibObjectFile.Tests.csproj b/src/LibObjectFile.Tests/LibObjectFile.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <IsPackable>false</IsPackable>
     <EnableMSTestRunner>true</EnableMSTestRunner>
diff --git a/src/LibObjectFile.Tests/PE/PEReaderTests.cs b/src/LibObjectFile.Tests/PE/PEReaderTests.cs
@@ -18,7 +18,7 @@ namespace LibObjectFile.Tests.PE;
 [UsesVerify]
 public partial class PEReaderTests
 {
-    [DataTestMethod]
+    [TestMethod]
     [DataRow("NativeConsoleWin64.exe")]
     [DataRow("NativeConsole2Win64.exe")]
     [DataRow("NativeLibraryWin64.dll")]
@@ -163,8 +163,8 @@ public void TestCreatePE()
         }
     }
     
-    [DataTestMethod]
-    [DynamicData(nameof(GetWindowsExeAndDlls), DynamicDataSourceType.Method)]
+    [TestMethod]
+    [DynamicData(nameof(GetWindowsExeAndDlls))]
     public async Task TestWindows(string sourceFile)
     {
         if (!OperatingSystem.IsWindows())
diff --git a/src/LibObjectFile.sln b/src/LibObjectFile.sln
diff --git a/src/LibObjectFile.slnx b/src/LibObjectFile.slnx
@@ -0,0 +1,22 @@
+<Solution>
+  <Folder Name="/doc/">
+    <File Path="../doc/readme.md" />
+  </Folder>
+  <Folder Name="/Solution Items/">
+    <File Path="../.editorconfig" />
+    <File Path="../.gitattributes" />
+    <File Path="../.github/workflows/ci.yml" />
+    <File Path="../.gitignore" />
+    <File Path="../license.txt" />
+    <File Path="../readme.md" />
+    <File Path="Directory.Build.props" />
+    <File Path="Directory.Packages.props" />
+    <File Path="dotnet-releaser.toml" />
+    <File Path="global.json" />
+  </Folder>
+  <Project Path="LibObjectFile.Bench/LibObjectFile.Bench.csproj" />
+  <Project Path="LibObjectFile.CodeGen/LibObjectFile.CodeGen.csproj" />
+  <Project Path="LibObjectFile.Tests/LibObjectFile.Tests.csproj" />
+  <Project Path="LibObjectFile/LibObjectFile.csproj" />
+  <Project Path="objdasm/objdasm.csproj" />
+</Solution>
diff --git a/src/LibObjectFile/Collections/ObjectList.cs b/src/LibObjectFile/Collections/ObjectList.cs
@@ -224,7 +224,6 @@ internal sealed class ObjectListDebuggerView
 
         public ObjectListDebuggerView(ObjectList<TObject> collection)
         {
-            ArgumentNullException.ThrowIfNull(collection, nameof(collection));
             _collection = collection.UnsafeList;
         }
 
diff --git a/src/LibObjectFile/Collections/SortedObjectList.cs b/src/LibObjectFile/Collections/SortedObjectList.cs
@@ -1,4 +1,4 @@
-﻿// Copyright (c) Alexandre Mutel. All rights reserved.
+// Copyright (c) Alexandre Mutel. All rights reserved.
 // This file is licensed under the BSD-Clause 2 license.
 // See the license.txt file in the project root for more information.
 
@@ -218,7 +218,6 @@ internal sealed class ObjectListDebuggerView
 
         public ObjectListDebuggerView(SortedObjectList<TObject> collection)
         {
-            ArgumentNullException.ThrowIfNull(collection, nameof(collection));
             _collection = collection.UnsafeList;
         }
 
diff --git a/src/LibObjectFile/Collections/TempSpan.cs b/src/LibObjectFile/Collections/TempSpan.cs
@@ -35,7 +35,7 @@ private TempSpan(Span<byte> span, int size)
     /// <param name="size">The size of the span in bytes.</param>
     private TempSpan(byte[] buffer, int size)
     {
-        _span = MemoryMarshal.Cast<byte, T>(new(buffer, 0, size));
+        _span = MemoryMarshal.Cast<byte, T>(new Span<byte>(buffer, 0, size));
         _buffer = buffer;
     }
 
diff --git a/src/LibObjectFile/LibObjectFile.csproj b/src/LibObjectFile/LibObjectFile.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks>net8.0;net10.0</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <Nullable>enable</Nullable>
   </PropertyGroup>
@@ -32,7 +32,6 @@
 
   <ItemGroup>
     <PackageReference Include="MinVer">
-      <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <!--Add support for sourcelink-->
diff --git a/src/LibObjectFile/PE/PEFile.cs b/src/LibObjectFile/PE/PEFile.cs
@@ -199,7 +199,6 @@ protected override bool TryFindByPositionInChildren(uint position, [NotNullWhen(
 
     public void RemoveSection(PESectionName name)
     {
-        ArgumentNullException.ThrowIfNull(name);
         if (!TryGetSection(name, out var section))
         {
             throw new KeyNotFoundException($"Cannot find section with name `{name}`");
@@ -212,7 +211,6 @@ public void RemoveSection(PESectionName name)
 
     public PESection GetSection(PESectionName name)
     {
-        ArgumentNullException.ThrowIfNull(name);
         if (!TryGetSection(name, out var section))
         {
             throw new KeyNotFoundException($"Cannot find section with name `{name}`");
@@ -223,7 +221,6 @@ public PESection GetSection(PESectionName name)
 
     public bool TryGetSection(PESectionName name, [NotNullWhen(true)] out PESection? section)
     {
-        ArgumentNullException.ThrowIfNull(name);
         var sections = CollectionsMarshal.AsSpan(_sections.UnsafeList);
         foreach (var trySection in sections)
         {
diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.100",
+    "version": "10.0.100",
     "rollForward": "latestMinor",
     "allowPrerelease": false
   }
diff --git a/src/objdasm/ObjDisasmApp.cs b/src/objdasm/ObjDisasmApp.cs
@@ -109,7 +109,7 @@ private static void Disasm(Stream stream, uint size, TextWriter writer, Formatte
     {
         var buffer = ArrayPool<byte>.Shared.Rent((int)size);
         var startPosition = stream.Position;
-        stream.Read(buffer, 0, (int) size);
+        stream.ReadExactly(buffer, 0, (int) size);
         stream.Position = startPosition;
 
         // You can also pass in a hex string, eg. "90 91 929394", or you can use your own CodeReader
diff --git a/src/objdasm/objdasm.csproj b/src/objdasm/objdasm.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net10.0</TargetFramework>
     <RootNamespace>LibObjectFile.Disasm</RootNamespace>
     <IsPackable>false</IsPackable>
   </PropertyGroup>

Original file line number	Diff line number	Diff line change
`@@ -17,8 +17,8 @@ namespace LibObjectFile.Tests.Elf;`
`17`	`17`	`[TestClass]`
`18`	`18`	`public class ElfSimpleTests : ElfTestBase`
`19`	`19`	`{`
`20`		`- [DataTestMethod]`
`21`		`- [DynamicData(nameof(GetLinuxBins), DynamicDataSourceType.Method)]`
	`20`	`+ [TestMethod]`
	`21`	`+ [DynamicData(nameof(GetLinuxBins))]`
`22`	`22`	`public void TestLinuxFile(string file)`
`23`	`23`	`{`
`24`	`24`	`if (string.IsNullOrEmpty(file))`
`@@ -526,7 +526,7 @@ public void TestManySections()`
`526`	`526`	`}`
`527`	`527`	`}`
`528`	`528`
`529`		`- [DataTestMethod]`
	`529`	`+ [TestMethod]`
`530`	`530`	`[DataRow("helloworld")]`
`531`	`531`	`[DataRow("libstdc++.so")]`
`532`	`532`	`[DataRow("helloworld_debug")]`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ namespace LibObjectFile.Tests.PE;`
`18`	`18`	`[UsesVerify]`
`19`	`19`	`public partial class PEReaderTests`
`20`	`20`	`{`
`21`		`- [DataTestMethod]`
	`21`	`+ [TestMethod]`
`22`	`22`	`[DataRow("NativeConsoleWin64.exe")]`
`23`	`23`	`[DataRow("NativeConsole2Win64.exe")]`
`24`	`24`	`[DataRow("NativeLibraryWin64.dll")]`
`@@ -163,8 +163,8 @@ public void TestCreatePE()`
`163`	`163`	`}`
`164`	`164`	`}`
`165`	`165`
`166`		`- [DataTestMethod]`
`167`		`- [DynamicData(nameof(GetWindowsExeAndDlls), DynamicDataSourceType.Method)]`
	`166`	`+ [TestMethod]`
	`167`	`+ [DynamicData(nameof(GetWindowsExeAndDlls))]`
`168`	`168`	`public async Task TestWindows(string sourceFile)`
`169`	`169`	`{`
`170`	`170`	`if (!OperatingSystem.IsWindows())`