Target .NET 10 runtime (#12)

jozefizso · web-flow · commit 4c1f55ba84d2 · 2025-10-08T21:35:05.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -37,7 +37,7 @@ jobs:
     - name: setup dotnet
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8
+        dotnet-version: 10
 
     - name: restore
       run: dotnet restore
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -33,7 +33,7 @@ jobs:
     - name: setup dotnet
       uses: actions/setup-dotnet@v5
       with:
-        dotnet-version: 8
+        dotnet-version: 10
 
     - name: restore
       run: dotnet restore
diff --git a/Kavod.Vba.Compression.sln b/Kavod.Vba.Compression.sln
diff --git a/Kavod.Vba.Compression.sln.DotSettings b/Kavod.Vba.Compression.sln.DotSettings
diff --git a/Kavod.Vba.Compression.slnx b/Kavod.Vba.Compression.slnx
@@ -0,0 +1,4 @@
+<Solution>
+  <Project Path="src/Kavod.Vba.Compression.Tests/Kavod.Vba.Compression.Tests.csproj" />
+  <Project Path="src/Kavod.Vba.Compression/Kavod.Vba.Compression.csproj" />
+</Solution>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
 
   <PropertyGroup>
-    <VersionPrefix>2.0.0</VersionPrefix>
-    <TargetFrameworks>netstandard2.0;net8.0</TargetFrameworks>
-    <LangVersion>12.0</LangVersion>
+    <VersionPrefix>3.0.0</VersionPrefix>
+    <TargetFrameworks>net10.0</TargetFrameworks>
+    <LangVersion>14.0</LangVersion>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/Kavod.Vba.Compression.Tests/Kavod.Vba.Compression.Tests.csproj b/src/Kavod.Vba.Compression.Tests/Kavod.Vba.Compression.Tests.csproj
@@ -1,8 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net48;net8.0</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(TestNetCoreOnly)' == 'true' ">net8.0</TargetFrameworks>
+    <TargetFrameworks>net10.0</TargetFrameworks>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/Kavod.Vba.Compression/CompressedChunk.cs b/src/Kavod.Vba.Compression/CompressedChunk.cs
@@ -16,10 +16,7 @@ internal class CompressedChunk
     {
         internal CompressedChunk(DecompressedChunk decompressedChunk)
         {
-            if (decompressedChunk == null)
-            {
-                throw new ArgumentNullException(nameof(decompressedChunk));
-            }
+            ArgumentNullException.ThrowIfNull(decompressedChunk);
 
             ChunkData = new CompressedChunkData(decompressedChunk);
             if (ChunkData.Size >= Globals.MaxBytesPerChunk)
@@ -31,10 +28,7 @@ internal CompressedChunk(DecompressedChunk decompressedChunk)
 
         internal CompressedChunk(BinaryReader dataReader)
         {
-            if (dataReader == null)
-            {
-                throw new ArgumentNullException(nameof(dataReader));
-            }
+            ArgumentNullException.ThrowIfNull(dataReader);
 
             Header = new CompressedChunkHeader(dataReader);
             if (Header.IsCompressed)
diff --git a/src/Kavod.Vba.Compression/CompressedChunkData.cs b/src/Kavod.Vba.Compression/CompressedChunkData.cs
@@ -18,10 +18,7 @@ internal class CompressedChunkData : IChunkData
 
         internal CompressedChunkData(DecompressedChunk chunk)
         {
-            if (chunk == null)
-            {
-                throw new ArgumentNullException(nameof(chunk));
-            }
+            ArgumentNullException.ThrowIfNull(chunk);
 
             var tokens = Tokenizer.TokenizeUncompressedData(chunk.Data);
             _tokensequences.AddRange(tokens.ToTokenSequences());
@@ -31,15 +28,13 @@ internal CompressedChunkData(BinaryReader dataReader, UInt16 compressedChunkData
         {
             var data = dataReader.ReadBytes(compressedChunkDataSize);
 
-            using (var reader = new BinaryReader(new MemoryStream(data)))
+            using var reader = new BinaryReader(new MemoryStream(data));
+            var position = 0;
+            while (reader.BaseStream.Position < reader.BaseStream.Length)
             {
-                var position = 0;
-                while (reader.BaseStream.Position < reader.BaseStream.Length)
-                {
-                    var sequence = TokenSequence.GetFromCompressedData(reader, position);
-                    _tokensequences.Add(sequence);
-                    position += (int)sequence.Tokens.Sum(t => t.Length);
-                }
+                var sequence = TokenSequence.GetFromCompressedData(reader, position);
+                _tokensequences.Add(sequence);
+                position += (int)sequence.Tokens.Sum(t => t.Length);
             }
         }
 
diff --git a/src/Kavod.Vba.Compression/CompressedContainer.cs b/src/Kavod.Vba.Compression/CompressedContainer.cs
@@ -18,7 +18,7 @@ internal class CompressedContainer
     {
         private const byte SignatureByteSig = 0x1;
 
-        private readonly List<CompressedChunk> _compressedChunks = new List<CompressedChunk>();
+        private readonly List<CompressedChunk> _compressedChunks = [];
         
         internal CompressedContainer(byte[] compressedData)
         {
@@ -47,21 +47,17 @@ internal CompressedContainer(DecompressedBuffer buffer)
 
         internal byte[] SerializeData()
         {
-            using (var writer = new BinaryWriter(new MemoryStream()))
-            {
-                writer.Write(SignatureByteSig);
-
-                foreach (var chunk in CompressedChunks)
-                {
-                    writer.Write(chunk.SerializeData());
-                }
+            using var writer = new BinaryWriter(new MemoryStream());
+            writer.Write(SignatureByteSig);
 
-                using (var reader = new BinaryReader(writer.BaseStream))
-                {
-                    reader.BaseStream.Position = 0;
-                    return reader.ReadBytes((int) reader.BaseStream.Length);
-                }
+            foreach (var chunk in CompressedChunks)
+            {
+                writer.Write(chunk.SerializeData());
             }
+
+            using var reader = new BinaryReader(writer.BaseStream);
+            reader.BaseStream.Position = 0;
+            return reader.ReadBytes((int)reader.BaseStream.Length);
         }
     }
-}
+}
diff --git a/src/Kavod.Vba.Compression/DecompressedBuffer.cs b/src/Kavod.Vba.Compression/DecompressedBuffer.cs
@@ -12,13 +12,11 @@ internal class DecompressedBuffer
     {
         internal DecompressedBuffer(byte[] uncompressedData)
         {
-            using (var reader = new BinaryReader(new MemoryStream(uncompressedData)))
+            using var reader = new BinaryReader(new MemoryStream(uncompressedData));
+            while (reader.BaseStream.Position < reader.BaseStream.Length)
             {
-                while (reader.BaseStream.Position < reader.BaseStream.Length)
-                {
-                    var chunk = new DecompressedChunk(reader);
-                    DecompressedChunks.Add(chunk);
-                }
+                var chunk = new DecompressedChunk(reader);
+                DecompressedChunks.Add(chunk);
             }
         }
 
@@ -36,20 +34,16 @@ internal byte[] Data
         {
             get
             {
-                using (var writer = new BinaryWriter(new MemoryStream()))
+                using var writer = new BinaryWriter(new MemoryStream());
+                foreach (var chunk in DecompressedChunks)
                 {
-                    foreach (var chunk in DecompressedChunks)
-                    {
-                        writer.Write(chunk.Data);
-                    }
+                    writer.Write(chunk.Data);
+                }
 
-                    using (var reader = new BinaryReader(writer.BaseStream))
-                    {
-                        reader.BaseStream.Position = 0;
+                using var reader = new BinaryReader(writer.BaseStream);
+                reader.BaseStream.Position = 0;
 
-                        return reader.ReadBytes((int) reader.BaseStream.Length);
-                    }
-                }
+                return reader.ReadBytes((int)reader.BaseStream.Length);
             }
         }
     }
diff --git a/src/Kavod.Vba.Compression/DecompressedChunk.cs b/src/Kavod.Vba.Compression/DecompressedChunk.cs
@@ -16,20 +16,18 @@ internal DecompressedChunk(CompressedChunk compressedChunk)
             if (compressedChunk.Header.IsCompressed)
             {
                 // Loop through all the data, get TokenSequences and decompress them.
-                using (var writer = new BinaryWriter(new MemoryStream()))
+                using var writer = new BinaryWriter(new MemoryStream());
+                var tokens = ((CompressedChunkData)compressedChunk.ChunkData).TokenSequences;
+                foreach (var sequence in tokens)
                 {
-                    var tokens = ((CompressedChunkData)compressedChunk.ChunkData).TokenSequences;
-                    foreach (var sequence in tokens)
-                    {
-                        sequence.Tokens.DecompressTokenSequence(writer);
-                    }
+                    sequence.Tokens.DecompressTokenSequence(writer);
+                }
 
-                    var stream = (MemoryStream)writer.BaseStream;
-                    var decompressedData = stream.GetBuffer();
-                    Array.Resize(ref decompressedData, (int)stream.Length);
+                var stream = (MemoryStream)writer.BaseStream;
+                var decompressedData = stream.GetBuffer();
+                Array.Resize(ref decompressedData, (int)stream.Length);
 
-                    Data = decompressedData;
-                }
+                Data = decompressedData;
             }
             else
             {
diff --git a/src/Kavod.Vba.Compression/LiteralToken.cs b/src/Kavod.Vba.Compression/LiteralToken.cs
@@ -20,7 +20,7 @@ internal LiteralToken(BinaryReader dataReader)
 
         internal LiteralToken(byte data)
         {
-            _data = new [] { data };
+            _data = [data];
         }
 
         public void DecompressToken(BinaryWriter writer)
diff --git a/src/Kavod.Vba.Compression/README.md b/src/Kavod.Vba.Compression/README.md
@@ -19,7 +19,7 @@ var compressedBytes = VbaCompression.Compress(contentBytes);
 
 ### Requirements
 
-Library works with .NET Framework 4.6.2 and 4.8, and .NET 8 runtimes.
+Library targets the .NET 10 runtime.
 
 
 ### Legal
diff --git a/src/Kavod.Vba.Compression/Tokenizer.cs b/src/Kavod.Vba.Compression/Tokenizer.cs
@@ -108,7 +108,7 @@ private static IEnumerable<CopyToken> AllPossibleCopyTokens(byte[] uncompressedD
             }
         }
 
-        private static IEnumerable<CopyToken> NormalizeCopyTokens(IEnumerable<CopyToken> copyTokens)
+        private static List<CopyToken> NormalizeCopyTokens(IEnumerable<CopyToken> copyTokens)
         {
             var remainingTokens = RemoveRedundantTokens(copyTokens).ToList();
 
@@ -162,10 +162,7 @@ private static IEnumerable<CopyToken> RemoveOverlappingTokens(IEnumerable<CopyTo
 
         private static Node FindBestPath(Node node)
         {
-            if (node == null)
-            {
-                throw new ArgumentNullException(nameof(node));
-            }
+            ArgumentNullException.ThrowIfNull(node);
 
             // find any overlapping tokens
             Node bestPath = null;
@@ -191,10 +188,7 @@ private static Node FindBestPath(Node node)
 
         private static IEnumerable<Node> GetOverlappingNodes(Node node)
         {
-            if (node == null)
-            {
-                throw new ArgumentNullException(nameof(node));
-            }
+            ArgumentNullException.ThrowIfNull(node);
 
             var firstNode = node;
 
@@ -208,10 +202,7 @@ private static IEnumerable<Node> GetOverlappingNodes(Node node)
 
         private static Node GetNextNonOverlappingNode(Node node)
         {
-            if (node == null)
-            {
-                throw new ArgumentNullException(nameof(node));
-            }
+            ArgumentNullException.ThrowIfNull(node);
 
             var firstNode = node;
 
@@ -322,10 +313,7 @@ private class Node : IEnumerable<CopyToken>
         {
             public Node(CopyToken value, Node nextNode)
             {
-                if (value == null)
-                {
-                    throw new ArgumentNullException(nameof(value));
-                }
+                ArgumentNullException.ThrowIfNull(value);
 
                 Value = value;
                 NextNode = nextNode;

Original file line number	Diff line number	Diff line change
`@@ -18,10 +18,7 @@ internal class CompressedChunkData : IChunkData`
`18`	`18`
`19`	`19`	`internal CompressedChunkData(DecompressedChunk chunk)`
`20`	`20`	`{`
`21`		`- if (chunk == null)`
`22`		`- {`
`23`		`- throw new ArgumentNullException(nameof(chunk));`
`24`		`- }`
	`21`	`+ ArgumentNullException.ThrowIfNull(chunk);`
`25`	`22`
`26`	`23`	`var tokens = Tokenizer.TokenizeUncompressedData(chunk.Data);`
`27`	`24`	`_tokensequences.AddRange(tokens.ToTokenSequences());`
`@@ -31,15 +28,13 @@ internal CompressedChunkData(BinaryReader dataReader, UInt16 compressedChunkData`
`31`	`28`	`{`
`32`	`29`	`var data = dataReader.ReadBytes(compressedChunkDataSize);`
`33`	`30`
`34`		`- using (var reader = new BinaryReader(new MemoryStream(data)))`
	`31`	`+ using var reader = new BinaryReader(new MemoryStream(data));`
	`32`	`+ var position = 0;`
	`33`	`+ while (reader.BaseStream.Position < reader.BaseStream.Length)`
`35`	`34`	`{`
`36`		`- var position = 0;`
`37`		`- while (reader.BaseStream.Position < reader.BaseStream.Length)`
`38`		`- {`
`39`		`- var sequence = TokenSequence.GetFromCompressedData(reader, position);`
`40`		`- _tokensequences.Add(sequence);`
`41`		`- position += (int)sequence.Tokens.Sum(t => t.Length);`
`42`		`- }`
	`35`	`+ var sequence = TokenSequence.GetFromCompressedData(reader, position);`
	`36`	`+ _tokensequences.Add(sequence);`
	`37`	`+ position += (int)sequence.Tokens.Sum(t => t.Length);`
`43`	`38`	`}`
`44`	`39`	`}`
`45`	`40`