refactor: c# 12, .net 8, upgraded all dependencies

MarcusWichelmann · Jul 26, 2024 · 80776df · 80776df
1 parent 88c5e93
commit 80776df
Show file tree

Hide file tree

Showing 179 changed files with 10,921 additions and 12,367 deletions.
diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.BufferWriting-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.BufferWriting-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.BufferWriting-20201110-192311</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.ImmutableDictionaryLookup-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.ImmutableDictionaryLookup-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.ImmutableDictionaryLookup-20200714-200711</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.LockOverhead-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.LockOverhead-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.LockOverhead-20200825-220153</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.MaxValueToDepth-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.MaxValueToDepth-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.MaxValueToDepth-20200823-173129</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.MemoryCopy-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.MemoryCopy-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.MemoryCopy-20200823-155139</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.PlainVsCursorStruct-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.PlainVsCursorStruct-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.PlainVsCursorStruct-20200726-153143</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/BenchmarkDotNet.Artifacts/results/Benchmarks.PropertiesVsFields-report.html b/BenchmarkDotNet.Artifacts/results/Benchmarks.PropertiesVsFields-report.html
@@ -3,12 +3,12 @@
 <head>
 <meta charset='utf-8' />
 <title>Benchmarks.PropertiesVsFields-20200825-210502</title>
-
-<style type="text/css">
-	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
-	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
-	tr { background-color: #fff; border-top: 1px solid #ccc; }
-	tr:nth-child(even) { background: #f8f8f8; }
+
+<style type="text/css">
+	table { border-collapse: collapse; display: block; width: 100%; overflow: auto; }
+	td, th { padding: 6px 13px; border: 1px solid #ddd; text-align: right; }
+	tr { background-color: #fff; border-top: 1px solid #ccc; }
+	tr:nth-child(even) { background: #f8f8f8; }
 </style>
 </head>
 <body>

diff --git a/MarcusW.VncClient.sln.DotSettings b/MarcusW.VncClient.sln.DotSettings
@@ -1,2 +1,7 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=WpfVncClient_002EAnnotations/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=WpfVncClient_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
+
+
+
+
+	</wpf:ResourceDictionary>
diff --git a/benchmarks/Benchmarks/Benchmarks.csproj b/benchmarks/Benchmarks/Benchmarks.csproj
@@ -1,13 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-        <OutputType>Exe</OutputType>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Include="BenchmarkDotNet" Version="0.12.1" />
-    </ItemGroup>
-
-</Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <OutputType>Exe</OutputType>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Nullable>enable</Nullable>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+  </ItemGroup>
+</Project>
diff --git a/benchmarks/Benchmarks/BufferWriting.cs b/benchmarks/Benchmarks/BufferWriting.cs
@@ -2,95 +2,94 @@
 using System.Runtime.CompilerServices;
 using BenchmarkDotNet.Attributes;
 
-namespace Benchmarks
+namespace Benchmarks;
+
+public class BufferWriting
 {
-    public class BufferWriting
+    private readonly byte[] _buffer = new byte[1920 * 1080 * 4];
+
+    [Benchmark]
+    public void ArrayIndexer()
     {
-        private readonly byte[] _buffer = new byte[1920 * 1080 * 4];
+        for (var i = 0; i < _buffer.Length; i += 4)
+            SetPixelArrayIndexer(_buffer, i, 0xffffffff);
+    }
 
-        [Benchmark]
-        public void ArrayIndexer()
+    [Benchmark]
+    public unsafe void Pointer()
+    {
+        fixed (byte* ptr = &_buffer[0])
         {
-            for (int i = 0; i < _buffer.Length; i += 4)
-                SetPixelArrayIndexer(_buffer, i, 0xffffffff);
+            for (var i = 0; i < _buffer.Length; i += 4)
+                SetPixelPointer(ptr + i, 0xffffffff);
         }
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void SetPixelArrayIndexer(byte[] buffer, int i, uint color)
+    [Benchmark]
+    public unsafe void PointerMemcpy()
+    {
+        fixed (byte* ptr = &_buffer[0])
         {
-            buffer[i] = (byte)(color & 0xff);
-            buffer[i + 1] = (byte)((color >> 8) & 0xff);
-            buffer[i + 2] = (byte)((color >> 16) & 0xff);
-            buffer[i + 3] = (byte)((color >> 24) & 0xff);
+            for (var i = 0; i < _buffer.Length; i += 4)
+                SetPixelPointerMemcpy(ptr + i, 0xffffffff);
         }
+    }
 
-        [Benchmark]
-        public void Span()
+    [Benchmark]
+    public unsafe void PointerReinterpretCast()
+    {
+        fixed (byte* ptr = &_buffer[0])
         {
-            Span<byte> buffer = _buffer;
-
-            for (int i = 0; i < _buffer.Length; i += 4)
-                SetPixelSpan(buffer.Slice(i, 4), 0xffffffff);
+            for (var i = 0; i < _buffer.Length; i += 4)
+                SetPixelPointerReinterpretCast(ptr + i, 0xffffffff);
         }
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private void SetPixelSpan(in Span<byte> span, uint color)
-        {
-            span[0] = (byte)(color & 0xff);
-            span[1] = (byte)((color >> 8) & 0xff);
-            span[2] = (byte)((color >> 16) & 0xff);
-            span[3] = (byte)((color >> 24) & 0xff);
-        }
+    [Benchmark]
+    public void Span()
+    {
+        Span<byte> buffer = _buffer;
 
-        [Benchmark]
-        public unsafe void Pointer()
-        {
-            fixed (byte* ptr = &_buffer[0])
-            {
-                for (int i = 0; i < _buffer.Length; i += 4)
-                    SetPixelPointer(ptr + i, 0xffffffff);
-            }
-        }
+        for (var i = 0; i < _buffer.Length; i += 4)
+            SetPixelSpan(buffer.Slice(i, 4), 0xffffffff);
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private unsafe void SetPixelPointer(byte* ptr, uint color)
-        {
-            *ptr++ = (byte)(color & 0xff);
-            *ptr++ = (byte)((color >> 8) & 0xff);
-            *ptr++ = (byte)((color >> 16) & 0xff);
-            *ptr = (byte)((color >> 24) & 0xff);
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void SetPixelArrayIndexer(byte[] buffer, int i, uint color)
+    {
+        buffer[i] = (byte)(color & 0xff);
+        buffer[i + 1] = (byte)((color >> 8) & 0xff);
+        buffer[i + 2] = (byte)((color >> 16) & 0xff);
+        buffer[i + 3] = (byte)((color >> 24) & 0xff);
+    }
 
-        [Benchmark]
-        public unsafe void PointerReinterpretCast()
-        {
-            fixed (byte* ptr = &_buffer[0])
-            {
-                for (int i = 0; i < _buffer.Length; i += 4)
-                    SetPixelPointerReinterpretCast(ptr + i, 0xffffffff);
-            }
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private unsafe void SetPixelPointer(byte* ptr, uint color)
+    {
+        *ptr++ = (byte)(color & 0xff);
+        *ptr++ = (byte)((color >> 8) & 0xff);
+        *ptr++ = (byte)((color >> 16) & 0xff);
+        *ptr = (byte)((color >> 24) & 0xff);
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private unsafe void SetPixelPointerReinterpretCast(byte* ptr, uint color)
-        {
-            *(uint*)ptr = color;
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private unsafe void SetPixelPointerMemcpy(byte* ptr, uint color)
+    {
+        Unsafe.CopyBlock(ptr, &color, sizeof(uint));
+    }
 
-        [Benchmark]
-        public unsafe void PointerMemcpy()
-        {
-            fixed (byte* ptr = &_buffer[0])
-            {
-                for (int i = 0; i < _buffer.Length; i += 4)
-                    SetPixelPointerMemcpy(ptr + i, 0xffffffff);
-            }
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private unsafe void SetPixelPointerReinterpretCast(byte* ptr, uint color)
+    {
+        *(uint*)ptr = color;
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private unsafe void SetPixelPointerMemcpy(byte* ptr, uint color)
-        {
-            Unsafe.CopyBlock(ptr, &color, sizeof(uint));
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private void SetPixelSpan(in Span<byte> span, uint color)
+    {
+        span[0] = (byte)(color & 0xff);
+        span[1] = (byte)((color >> 8) & 0xff);
+        span[2] = (byte)((color >> 16) & 0xff);
+        span[3] = (byte)((color >> 24) & 0xff);
     }
 }
diff --git a/benchmarks/Benchmarks/ImmutableDictionaryLookup.cs b/benchmarks/Benchmarks/ImmutableDictionaryLookup.cs
@@ -1,42 +1,33 @@
-using System;
+using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Linq;
 using BenchmarkDotNet.Attributes;
 
-namespace Benchmarks
+namespace Benchmarks;
+
+public class ImmutableDictionaryLookup
 {
-    public class ImmutableDictionaryLookup
-    {
-        private const int Index = 500;
-        private readonly IImmutableDictionary<int, object> _dictionary= Enumerable.Range(0, 1000).ToImmutableDictionary(i => i, i => new object());
+    private const int Index = 500;
 
-        [Benchmark]
-        public object Indexer()
-        {
-            if (!_dictionary.ContainsKey(Index))
-                return null;
-            return _dictionary[Index];
-        }
+    private readonly IImmutableDictionary<int, object> _dictionary =
+        Enumerable.Range(0, 1000).ToImmutableDictionary(i => i, _ => new object());
 
-        [Benchmark]
-        public object TryGet()
+    [Benchmark]
+    public object? Indexer() => CollectionExtensions.GetValueOrDefault(_dictionary, Index);
+
+    [Benchmark]
+    public object? TryCatch()
+    {
+        try
         {
-            if (!_dictionary.TryGetValue(Index, out object value))
-                return null;
-            return value;
+            return _dictionary[Index];
         }
-
-        [Benchmark]
-        public object TryCatch()
+        catch
         {
-            try
-            {
-                return _dictionary[Index];
-            }
-            catch
-            {
-                return null;
-            }
+            return null;
         }
     }
+
+    [Benchmark]
+    public object? TryGet() => CollectionExtensions.GetValueOrDefault(_dictionary, Index);
 }