openmcdf
diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml
@@ -22,15 +22,15 @@ jobs:
 
     steps:
     - name: Checkout
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         fetch-depth: 0
 
     # Install the .NET Core workload
     - name: Install .NET Core
-      uses: actions/setup-dotnet@v4
+      uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8.0.x
+        dotnet-version: 10.0.x
 
     # Check formatting
     - name: Check formatting

diff --git a/OpenMcdf.Benchmarks/OpenMcdf.Benchmarks.csproj b/OpenMcdf.Benchmarks/OpenMcdf.Benchmarks.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net10.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/OpenMcdf.Ole.Tests/OpenMcdf.Ole.Tests.csproj b/OpenMcdf.Ole.Tests/OpenMcdf.Ole.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) == false">net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net48;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) == false">net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net48;net10.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
 
     <IsPackable>false</IsPackable>

diff --git a/OpenMcdf.Ole/OpenMcdf.Ole.csproj b/OpenMcdf.Ole/OpenMcdf.Ole.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">

diff --git a/OpenMcdf.Perf/OpenMcdf.Perf.csproj b/OpenMcdf.Perf/OpenMcdf.Perf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
 

diff --git a/OpenMcdf.Tests/OpenMcdf.Tests.csproj b/OpenMcdf.Tests/OpenMcdf.Tests.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) == false">net8.0</TargetFrameworks>
-    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net48;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows')) == false">net8.0;net10.0</TargetFrameworks>
+    <TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">net48;net8.0-windows;net10.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
 
     <IsPackable>false</IsPackable>
@@ -33,7 +33,7 @@
     <PackageReference Include="MSTest" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0-windows'">
+  <ItemGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier($(TargetFramework))) == 'windows'">
     <ProjectReference Include="..\StructuredStorage\StructuredStorage.csproj" />
   </ItemGroup>
 

diff --git a/OpenMcdf.sln b/OpenMcdf.sln
@@ -10,8 +10,8 @@ EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{34030FA7-0A06-43D1-85DD-ADD39D502C3C}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
-		Directory.Build.props = Directory.Build.props
 		CHANGELOG.md = CHANGELOG.md
+		Directory.Build.props = Directory.Build.props
 		Directory.Build.targets = Directory.Build.targets
 		Directory.csproj.props = Directory.csproj.props
 		Directory.csproj.targets = Directory.csproj.targets

diff --git a/OpenMcdf/FatStream.cs b/OpenMcdf/FatStream.cs
@@ -112,7 +112,7 @@ public override int Read(byte[] buffer, int offset, int count)
                 return readCount;
             if (!chain.MoveNext())
                 throw new FileFormatException($"The FAT chain was shorter than the stream length.");
-        };
+        }
     }
 
     /// <inheritdoc/>

diff --git a/OpenMcdf/OpenMcdf.csproj b/OpenMcdf/OpenMcdf.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net8.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
@@ -30,7 +30,7 @@
     <PackageReference Include="System.Memory" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != 'netstandard2.0'">
     <Compile Remove="System/*.cs" />
     <None Include="System/*.cs" />
   </ItemGroup>

diff --git a/OpenMcdf/Storage.cs b/OpenMcdf/Storage.cs
@@ -334,7 +334,7 @@ public void Delete(string name)
             foreach (EntryInfo childEntry in storage.EnumerateEntries())
             {
                 storage.Delete(childEntry.Name);
-            };
+            }
         }
 
         if (entry.Type is StorageType.Stream && !SectorType.IsFreeOrEndOfChain(entry.StartSectorId))

diff --git a/README.md b/README.md
@@ -97,5 +97,5 @@ foreach (OleProperty prop in co.Properties)
 ```
 
 OpenMcdf runs happily on the [Mono](http://www.mono-project.com/) platform and multi-targets
-[**netstandard2.0**](https://learn.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-standard-2-0) and
-**net8.0** to maximize client compatibility and support modern dotnet features.
+[**netstandard2.0**](https://learn.microsoft.com/en-us/dotnet/standard/net-standard?tabs=net-standard-2-0),
+**net8.0**, and **net10.0** to maximize client compatibility and support modern dotnet features.
diff --git a/StructuredStorage/StructuredStorage.csproj b/StructuredStorage/StructuredStorage.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net8.0-windows</TargetFramework>
+    <TargetFrameworks>net8.0-windows;net10.0-windows</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 

diff --git a/StructuredStorageExplorer/MainForm.cs b/StructuredStorageExplorer/MainForm.cs
@@ -244,7 +244,7 @@ private void UpdateCurrentFileToolStripMenuItem_Click(object sender, EventArgs e
 
     private void AddStreamToolStripMenuItem_Click(object sender, EventArgs e)
     {
-        if (rootStorage is null || treeView.SelectedNode.Tag is not NodeSelection selection || selection.EntryInfo.Type is not EntryType.Storage)
+        if (rootStorage is null || treeView.SelectedNode?.Tag is not NodeSelection selection || selection.EntryInfo.Type is not EntryType.Storage)
             return;
 
         using AddEntryDialog addEntryDialog = new();
@@ -266,7 +266,7 @@ private void AddStreamToolStripMenuItem_Click(object sender, EventArgs e)
 
     private void AddStorageStripMenuItem_Click(object sender, EventArgs e)
     {
-        if (rootStorage is null || treeView.SelectedNode.Tag is not NodeSelection selection || selection.EntryInfo.Type is not EntryType.Storage)
+        if (rootStorage is null || treeView.SelectedNode?.Tag is not NodeSelection selection || selection.EntryInfo.Type is not EntryType.Storage)
             return;
 
         using AddEntryDialog addEntryDialog = new();

diff --git a/StructuredStorageExplorer/Program.cs b/StructuredStorageExplorer/Program.cs
@@ -8,6 +8,7 @@ static class Program
     [STAThread]
     static void Main()
     {
+        Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
         Application.EnableVisualStyles();
         Application.SetCompatibleTextRenderingDefault(false);
         Application.Run(new MainForm());

diff --git a/StructuredStorageExplorer/StructuredStorageExplorer.csproj b/StructuredStorageExplorer/StructuredStorageExplorer.csproj
@@ -1,11 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net10.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <UseWindowsForms>true</UseWindowsForms>
-    <ApplicationHighDpiMode>PerMonitorV2</ApplicationHighDpiMode>
     <ForceDesignerDpiUnaware>true</ForceDesignerDpiUnaware>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/StructuredStorageExplorer/app.manifest b/StructuredStorageExplorer/app.manifest
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.402",
-    "rollForward": "latestMinor",
-    "allowPrerelease": false
+    "version": "10.0.100",
+    "rollForward": "latestMajor",
+    "allowPrerelease": true
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -334,7 +334,7 @@ public void Delete(string name) @@
                 foreach (EntryInfo childEntry in storage.EnumerateEntries())
                 {
                     storage.Delete(childEntry.Name);
-                };
+                }
             }
             if (entry.Type is StorageType.Stream && !SectorType.IsFreeOrEndOfChain(entry.StartSectorId))
@@ Expand Down @@