Update/net7 (#290)

* file-scoped namespace & net7.0

* Workflow

FModel/Extensions/AvalonExtensions.cs

@@ -4,47 +4,46 @@ using System.Xml;
 using ICSharpCode.AvalonEdit.Highlighting;
 using ICSharpCode.AvalonEdit.Highlighting.Xshd;
 
-namespace FModel.Extensions
+namespace FModel.Extensions;
+
+public static class AvalonExtensions
 {
-    public static class AvalonExtensions
+    private static readonly IHighlightingDefinition _jsonHighlighter = LoadHighlighter("Json.xshd");
+    private static readonly IHighlightingDefinition _iniHighlighter = LoadHighlighter("Ini.xshd");
+    private static readonly IHighlightingDefinition _xmlHighlighter = LoadHighlighter("Xml.xshd");
+    private static readonly IHighlightingDefinition _cppHighlighter = LoadHighlighter("Cpp.xshd");
+    private static readonly IHighlightingDefinition _changelogHighlighter = LoadHighlighter("Changelog.xshd");
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static IHighlightingDefinition LoadHighlighter(string resourceName)
     {
-        private static readonly IHighlightingDefinition _jsonHighlighter = LoadHighlighter("Json.xshd");
-        private static readonly IHighlightingDefinition _iniHighlighter = LoadHighlighter("Ini.xshd");
-        private static readonly IHighlightingDefinition _xmlHighlighter = LoadHighlighter("Xml.xshd");
-        private static readonly IHighlightingDefinition _cppHighlighter = LoadHighlighter("Cpp.xshd");
-        private static readonly IHighlightingDefinition _changelogHighlighter = LoadHighlighter("Changelog.xshd");
+        var executingAssembly = Assembly.GetExecutingAssembly();
+        using var stream = executingAssembly.GetManifestResourceStream($"{executingAssembly.GetName().Name}.Resources.{resourceName}");
+        using var reader = new XmlTextReader(stream);
+        return HighlightingLoader.Load(reader, HighlightingManager.Instance);
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static IHighlightingDefinition LoadHighlighter(string resourceName)
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static IHighlightingDefinition HighlighterSelector(string ext)
+    {
+        switch (ext)
         {
-            var executingAssembly = Assembly.GetExecutingAssembly();
-            using var stream = executingAssembly.GetManifestResourceStream($"{executingAssembly.GetName().Name}.Resources.{resourceName}");
-            using var reader = new XmlTextReader(stream);
-            return HighlightingLoader.Load(reader, HighlightingManager.Instance);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static IHighlightingDefinition HighlighterSelector(string ext)
-        {
-            switch (ext)
-            {
-                case "ini":
-                case "csv":
-                    return _iniHighlighter;
-                case "xml":
-                    return _xmlHighlighter;
-                case "h":
-                case "cpp":
-                    return _cppHighlighter;
-                case "changelog":
-                    return _changelogHighlighter;
-                case "bat":
-                case "txt":
-                case "po":
-                    return null;
-                default:
-                    return _jsonHighlighter;
-            }
+            case "ini":
+            case "csv":
+                return _iniHighlighter;
+            case "xml":
+                return _xmlHighlighter;
+            case "h":
+            case "cpp":
+                return _cppHighlighter;
+            case "changelog":
+                return _changelogHighlighter;
+            case "bat":
+            case "txt":
+            case "po":
+                return null;
+            default:
+                return _jsonHighlighter;
         }
     }
 }

FModel/Extensions/ClipboardExtensions.cs

@@ -1,5 +1,4 @@
 using SkiaSharp;
-
 using System;
 using System.Drawing;
 using System.Drawing.Imaging;
@@ -8,191 +7,192 @@ using System.Runtime.CompilerServices;
 using System.Text;
 using System.Windows;
 
-namespace FModel.Extensions
+namespace FModel.Extensions;
+
+public static class ClipboardExtensions
 {
-    public static class ClipboardExtensions
+    public static void SetImage(byte[] pngBytes, string fileName = null)
     {
-        public static void SetImage(byte[] pngBytes, string fileName = null)
+        Clipboard.Clear();
+        var data = new DataObject();
+        using var pngMs = new MemoryStream(pngBytes);
+        using var image = Image.FromStream(pngMs);
+        // As standard bitmap, without transparency support
+        data.SetData(DataFormats.Bitmap, image, true);
+        // As PNG. Gimp will prefer this over the other two
+        data.SetData("PNG", pngMs, false);
+        // As DIB. This is (wrongly) accepted as ARGB by many applications
+        using var dibMemStream = new MemoryStream(ConvertToDib(image));
+        data.SetData(DataFormats.Dib, dibMemStream, false);
+        // Optional fileName
+        if (!string.IsNullOrEmpty(fileName))
         {
-            Clipboard.Clear();
-            var data = new DataObject();
-            using var pngMs = new MemoryStream(pngBytes);
-            using var image = Image.FromStream(pngMs);
-            // As standard bitmap, without transparency support
-            data.SetData(DataFormats.Bitmap, image, true);
-            // As PNG. Gimp will prefer this over the other two
-            data.SetData("PNG", pngMs, false);
-            // As DIB. This is (wrongly) accepted as ARGB by many applications
-            using var dibMemStream = new MemoryStream(ConvertToDib(image));
-            data.SetData(DataFormats.Dib, dibMemStream, false);
-            // Optional fileName
-            if (!string.IsNullOrEmpty(fileName))
+            var htmlFragment = GenerateHTMLFragment($"<img src=\"{fileName}\"/>");
+            data.SetData(DataFormats.Html, htmlFragment);
+        }
+        // The 'copy=true' argument means the MemoryStreams can be safely disposed after the operation
+        Clipboard.SetDataObject(data, true);
+    }
+
+    public static byte[] ConvertToDib(Image image)
+    {
+        byte[] bm32bData;
+        var width = image.Width;
+        var height = image.Height;
+
+        // Ensure image is 32bppARGB by painting it on a new 32bppARGB image.
+        using (var bm32b = new Bitmap(width, height, PixelFormat.Format32bppPArgb))
+        {
+            using (var gr = Graphics.FromImage(bm32b))
             {
-                var htmlFragment = GenerateHTMLFragment($"<img src=\"{fileName}\"/>");
-                data.SetData(DataFormats.Html, htmlFragment);
+                gr.DrawImage(image, new Rectangle(0, 0, width, height));
             }
-            // The 'copy=true' argument means the MemoryStreams can be safely disposed after the operation
-            Clipboard.SetDataObject(data, true);
+
+            // Bitmap format has its lines reversed.
+            bm32b.RotateFlip(RotateFlipType.Rotate180FlipX);
+            bm32bData = GetRawBytes(bm32b);
         }
 
-        public static byte[] ConvertToDib(Image image)
+        // BITMAPINFOHEADER struct for DIB.
+        const int hdrSize = 0x28;
+        var fullImage = new byte[hdrSize + 12 + bm32bData.Length];
+        //Int32 biSize;
+        WriteIntToByteArray(fullImage, 0x00, 4, true, hdrSize);
+        //Int32 biWidth;
+        WriteIntToByteArray(fullImage, 0x04, 4, true, (uint) width);
+        //Int32 biHeight;
+        WriteIntToByteArray(fullImage, 0x08, 4, true, (uint) height);
+        //Int16 biPlanes;
+        WriteIntToByteArray(fullImage, 0x0C, 2, true, 1);
+        //Int16 biBitCount;
+        WriteIntToByteArray(fullImage, 0x0E, 2, true, 32);
+        //BITMAPCOMPRESSION biCompression = BITMAPCOMPRESSION.BITFIELDS;
+        WriteIntToByteArray(fullImage, 0x10, 4, true, 3);
+        //Int32 biSizeImage;
+        WriteIntToByteArray(fullImage, 0x14, 4, true, (uint) bm32bData.Length);
+        // These are all 0. Since .net clears new arrays, don't bother writing them.
+        //Int32 biXPelsPerMeter = 0;
+        //Int32 biYPelsPerMeter = 0;
+        //Int32 biClrUsed = 0;
+        //Int32 biClrImportant = 0;
+
+        // The aforementioned "BITFIELDS": colour masks applied to the Int32 pixel value to get the R, G and B values.
+        WriteIntToByteArray(fullImage, hdrSize + 0, 4, true, 0x00FF0000);
+        WriteIntToByteArray(fullImage, hdrSize + 4, 4, true, 0x0000FF00);
+        WriteIntToByteArray(fullImage, hdrSize + 8, 4, true, 0x000000FF);
+
+        Unsafe.CopyBlockUnaligned(ref fullImage[hdrSize + 12], ref bm32bData[0], (uint) bm32bData.Length);
+        return fullImage;
+    }
+
+    private static byte[] ConvertToDib(byte[] pngBytes = null)
+    {
+        byte[] bm32bData;
+        int width, height;
+
+        using (var skBmp = SKBitmap.Decode(pngBytes))
         {
-            byte[] bm32bData;
-            var width = image.Width;
-            var height = image.Height;
-
-            // Ensure image is 32bppARGB by painting it on a new 32bppARGB image.
-            using (var bm32b = new Bitmap(width, height, PixelFormat.Format32bppPArgb))
-            {
-                using (var gr = Graphics.FromImage(bm32b))
-                {
-                    gr.DrawImage(image, new Rectangle(0, 0, width, height));
-                }
-                // Bitmap format has its lines reversed.
-                bm32b.RotateFlip(RotateFlipType.Rotate180FlipX);
-                bm32bData = GetRawBytes(bm32b);
-            }
-
-            // BITMAPINFOHEADER struct for DIB.
-            const int hdrSize = 0x28;
-            var fullImage = new byte[hdrSize + 12 + bm32bData.Length];
-            //Int32 biSize;
-            WriteIntToByteArray(fullImage, 0x00, 4, true, hdrSize);
-            //Int32 biWidth;
-            WriteIntToByteArray(fullImage, 0x04, 4, true, (uint)width);
-            //Int32 biHeight;
-            WriteIntToByteArray(fullImage, 0x08, 4, true, (uint)height);
-            //Int16 biPlanes;
-            WriteIntToByteArray(fullImage, 0x0C, 2, true, 1);
-            //Int16 biBitCount;
-            WriteIntToByteArray(fullImage, 0x0E, 2, true, 32);
-            //BITMAPCOMPRESSION biCompression = BITMAPCOMPRESSION.BITFIELDS;
-            WriteIntToByteArray(fullImage, 0x10, 4, true, 3);
-            //Int32 biSizeImage;
-            WriteIntToByteArray(fullImage, 0x14, 4, true, (uint)bm32bData.Length);
-            // These are all 0. Since .net clears new arrays, don't bother writing them.
-            //Int32 biXPelsPerMeter = 0;
-            //Int32 biYPelsPerMeter = 0;
-            //Int32 biClrUsed = 0;
-            //Int32 biClrImportant = 0;
-
-            // The aforementioned "BITFIELDS": colour masks applied to the Int32 pixel value to get the R, G and B values.
-            WriteIntToByteArray(fullImage, hdrSize + 0, 4, true, 0x00FF0000);
-            WriteIntToByteArray(fullImage, hdrSize + 4, 4, true, 0x0000FF00);
-            WriteIntToByteArray(fullImage, hdrSize + 8, 4, true, 0x000000FF);
-
-            Unsafe.CopyBlockUnaligned(ref fullImage[hdrSize + 12], ref bm32bData[0], (uint)bm32bData.Length);
-            return fullImage;
+            width = skBmp.Width;
+            height = skBmp.Height;
+            using var rotated = new SKBitmap(new SKImageInfo(width, height, skBmp.ColorType));
+            using var canvas = new SKCanvas(rotated);
+            canvas.Scale(1, -1, 0, height / 2.0f);
+            canvas.DrawBitmap(skBmp, SKPoint.Empty);
+            canvas.Flush();
+            bm32bData = rotated.Bytes;
         }
 
-        private static byte[] ConvertToDib(byte[] pngBytes = null)
+        // BITMAPINFOHEADER struct for DIB.
+        const int hdrSize = 0x28;
+        var fullImage = new byte[hdrSize + 12 + bm32bData.Length];
+        //Int32 biSize;
+        WriteIntToByteArray(fullImage, 0x00, 4, true, hdrSize);
+        //Int32 biWidth;
+        WriteIntToByteArray(fullImage, 0x04, 4, true, (uint) width);
+        //Int32 biHeight;
+        WriteIntToByteArray(fullImage, 0x08, 4, true, (uint) height);
+        //Int16 biPlanes;
+        WriteIntToByteArray(fullImage, 0x0C, 2, true, 1);
+        //Int16 biBitCount;
+        WriteIntToByteArray(fullImage, 0x0E, 2, true, 32);
+        //BITMAPCOMPRESSION biCompression = BITMAPCOMPRESSION.BITFIELDS;
+        WriteIntToByteArray(fullImage, 0x10, 4, true, 3);
+        //Int32 biSizeImage;
+        WriteIntToByteArray(fullImage, 0x14, 4, true, (uint) bm32bData.Length);
+        // These are all 0. Since .net clears new arrays, don't bother writing them.
+        //Int32 biXPelsPerMeter = 0;
+        //Int32 biYPelsPerMeter = 0;
+        //Int32 biClrUsed = 0;
+        //Int32 biClrImportant = 0;
+
+        // The aforementioned "BITFIELDS": colour masks applied to the Int32 pixel value to get the R, G and B values.
+        WriteIntToByteArray(fullImage, hdrSize + 0, 4, true, 0x00FF0000);
+        WriteIntToByteArray(fullImage, hdrSize + 4, 4, true, 0x0000FF00);
+        WriteIntToByteArray(fullImage, hdrSize + 8, 4, true, 0x000000FF);
+
+        Unsafe.CopyBlockUnaligned(ref fullImage[hdrSize + 12], ref bm32bData[0], (uint) bm32bData.Length);
+        return fullImage;
+    }
+
+    public static unsafe byte[] GetRawBytes(Bitmap bmp)
+    {
+        var rect = new Rectangle(0, 0, bmp.Width, bmp.Height);
+        var bmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, bmp.PixelFormat);
+        var bytes = (uint) (Math.Abs(bmpData.Stride) * bmp.Height);
+        var buffer = new byte[bytes];
+        fixed (byte* pBuffer = buffer)
         {
-            byte[] bm32bData;
-            int width, height;
-
-            using (var skBmp = SKBitmap.Decode(pngBytes))
-            {
-                width = skBmp.Width;
-                height = skBmp.Height;
-                using var rotated = new SKBitmap(new SKImageInfo(width, height, skBmp.ColorType));
-                using var canvas = new SKCanvas(rotated);
-                canvas.Scale(1, -1, 0, height / 2.0f);
-                canvas.DrawBitmap(skBmp, SKPoint.Empty);
-                canvas.Flush();
-                bm32bData = rotated.Bytes;
-            }
-
-            // BITMAPINFOHEADER struct for DIB.
-            const int hdrSize = 0x28;
-            var fullImage = new byte[hdrSize + 12 + bm32bData.Length];
-            //Int32 biSize;
-            WriteIntToByteArray(fullImage, 0x00, 4, true, hdrSize);
-            //Int32 biWidth;
-            WriteIntToByteArray(fullImage, 0x04, 4, true, (uint)width);
-            //Int32 biHeight;
-            WriteIntToByteArray(fullImage, 0x08, 4, true, (uint)height);
-            //Int16 biPlanes;
-            WriteIntToByteArray(fullImage, 0x0C, 2, true, 1);
-            //Int16 biBitCount;
-            WriteIntToByteArray(fullImage, 0x0E, 2, true, 32);
-            //BITMAPCOMPRESSION biCompression = BITMAPCOMPRESSION.BITFIELDS;
-            WriteIntToByteArray(fullImage, 0x10, 4, true, 3);
-            //Int32 biSizeImage;
-            WriteIntToByteArray(fullImage, 0x14, 4, true, (uint)bm32bData.Length);
-            // These are all 0. Since .net clears new arrays, don't bother writing them.
-            //Int32 biXPelsPerMeter = 0;
-            //Int32 biYPelsPerMeter = 0;
-            //Int32 biClrUsed = 0;
-            //Int32 biClrImportant = 0;
-
-            // The aforementioned "BITFIELDS": colour masks applied to the Int32 pixel value to get the R, G and B values.
-            WriteIntToByteArray(fullImage, hdrSize + 0, 4, true, 0x00FF0000);
-            WriteIntToByteArray(fullImage, hdrSize + 4, 4, true, 0x0000FF00);
-            WriteIntToByteArray(fullImage, hdrSize + 8, 4, true, 0x000000FF);
-
-            Unsafe.CopyBlockUnaligned(ref fullImage[hdrSize + 12], ref bm32bData[0], (uint)bm32bData.Length);
-            return fullImage;
+            Unsafe.CopyBlockUnaligned(pBuffer, bmpData.Scan0.ToPointer(), bytes);
         }
 
-        public static unsafe byte[] GetRawBytes(Bitmap bmp)
+        bmp.UnlockBits(bmpData);
+        return buffer;
+    }
+
+    private static void WriteIntToByteArray(byte[] data, int startIndex, int bytes, bool littleEndian, uint value)
+    {
+        var lastByte = bytes - 1;
+
+        if (data.Length < startIndex + bytes)
         {
-            var rect = new Rectangle(0, 0, bmp.Width, bmp.Height);
-            var bmpData = bmp.LockBits(rect, ImageLockMode.ReadOnly, bmp.PixelFormat);
-            var bytes = (uint)(Math.Abs(bmpData.Stride) * bmp.Height);
-            var buffer = new byte[bytes];
-            fixed (byte* pBuffer = buffer)
-            {
-                Unsafe.CopyBlockUnaligned(pBuffer, bmpData.Scan0.ToPointer(), bytes);
-            }
-            bmp.UnlockBits(bmpData);
-            return buffer;
+            throw new ArgumentOutOfRangeException(nameof(startIndex), "Data array is too small to write a " + bytes + "-byte value at offset " + startIndex + ".");
         }
 
-        private static void WriteIntToByteArray(byte[] data, int startIndex, int bytes, bool littleEndian, uint value)
+        for (var index = 0; index < bytes; index++)
         {
-            var lastByte = bytes - 1;
-
-            if (data.Length < startIndex + bytes)
-            {
-                throw new ArgumentOutOfRangeException(nameof(startIndex), "Data array is too small to write a " + bytes + "-byte value at offset " + startIndex + ".");
-            }
-
-            for (var index = 0; index < bytes; index++)
-            {
-                var offs = startIndex + (littleEndian ? index : lastByte - index);
-                data[offs] = (byte)(value >> 8 * index & 0xFF);
-            }
-        }
-
-        private static string GenerateHTMLFragment(string html)
-        {
-            var sb = new StringBuilder();
-
-            const string header = "Version:0.9\r\nStartHTML:<<<<<<<<<1\r\nEndHTML:<<<<<<<<<2\r\nStartFragment:<<<<<<<<<3\r\nEndFragment:<<<<<<<<<4\r\n";
-            const string startHTML = "<html>\r\n<body>\r\n";
-            const string startFragment = "<!--StartFragment-->";
-            const string endFragment = "<!--EndFragment-->";
-            const string endHTML = "\r\n</body>\r\n</html>";
-
-            sb.Append(header);
-
-            var startHTMLLength = header.Length;
-            var startFragmentLength = startHTMLLength + startHTML.Length + startFragment.Length;
-            var endFragmentLength = startFragmentLength + Encoding.UTF8.GetByteCount(html);
-            var endHTMLLength = endFragmentLength + endFragment.Length + endHTML.Length;
-
-            sb.Replace("<<<<<<<<<1", startHTMLLength.ToString("D10"));
-            sb.Replace("<<<<<<<<<2", endHTMLLength.ToString("D10"));
-            sb.Replace("<<<<<<<<<3", startFragmentLength.ToString("D10"));
-            sb.Replace("<<<<<<<<<4", endFragmentLength.ToString("D10"));
-
-            sb.Append(startHTML);
-            sb.Append(startFragment);
-            sb.Append(html);
-            sb.Append(endFragment);
-            sb.Append(endHTML);
-
-            return sb.ToString();
+            var offs = startIndex + (littleEndian ? index : lastByte - index);
+            data[offs] = (byte) (value >> 8 * index & 0xFF);
         }
     }
+
+    private static string GenerateHTMLFragment(string html)
+    {
+        var sb = new StringBuilder();
+
+        const string header = "Version:0.9\r\nStartHTML:<<<<<<<<<1\r\nEndHTML:<<<<<<<<<2\r\nStartFragment:<<<<<<<<<3\r\nEndFragment:<<<<<<<<<4\r\n";
+        const string startHTML = "<html>\r\n<body>\r\n";
+        const string startFragment = "<!--StartFragment-->";
+        const string endFragment = "<!--EndFragment-->";
+        const string endHTML = "\r\n</body>\r\n</html>";
+
+        sb.Append(header);
+
+        var startHTMLLength = header.Length;
+        var startFragmentLength = startHTMLLength + startHTML.Length + startFragment.Length;
+        var endFragmentLength = startFragmentLength + Encoding.UTF8.GetByteCount(html);
+        var endHTMLLength = endFragmentLength + endFragment.Length + endHTML.Length;
+
+        sb.Replace("<<<<<<<<<1", startHTMLLength.ToString("D10"));
+        sb.Replace("<<<<<<<<<2", endHTMLLength.ToString("D10"));
+        sb.Replace("<<<<<<<<<3", startFragmentLength.ToString("D10"));
+        sb.Replace("<<<<<<<<<4", endFragmentLength.ToString("D10"));
+
+        sb.Append(startHTML);
+        sb.Append(startFragment);
+        sb.Append(html);
+        sb.Append(endFragment);
+        sb.Append(endHTML);
+
+        return sb.ToString();
+    }
 }

FModel/Extensions/CollectionExtensions.cs

@@ -2,36 +2,35 @@
 using System.Linq;
 using System.Runtime.CompilerServices;
 
-namespace FModel.Extensions
+namespace FModel.Extensions;
+
+public static class CollectionExtensions
 {
-    public static class CollectionExtensions
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T Next<T>(this IList<T> collection, T value)
     {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T Next<T>(this IList<T> collection, T value)
-        {
-            var i = collection.IndexOf(value) + 1;
-            return i >= collection.Count ? collection.First() : collection[i];
-        }
+        var i = collection.IndexOf(value) + 1;
+        return i >= collection.Count ? collection.First() : collection[i];
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T Next<T>(this IList<T> collection, int index)
-        {
-            var i = index + 1;
-            return i >= collection.Count ? collection.First() : collection[i];
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T Next<T>(this IList<T> collection, int index)
+    {
+        var i = index + 1;
+        return i >= collection.Count ? collection.First() : collection[i];
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T Previous<T>(this IList<T> collection, T value)
-        {
-            var i = collection.IndexOf(value) - 1;
-            return i < 0 ? collection.Last() : collection[i];
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T Previous<T>(this IList<T> collection, T value)
+    {
+        var i = collection.IndexOf(value) - 1;
+        return i < 0 ? collection.Last() : collection[i];
+    }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T Previous<T>(this IList<T> collection, int index)
-        {
-            var i = index - 1;
-            return i < 0 ? collection.Last() : collection[i];
-        }
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T Previous<T>(this IList<T> collection, int index)
+    {
+        var i = index - 1;
+        return i < 0 ? collection.Last() : collection[i];
     }
 }

FModel/Extensions/EnumExtensions.cs

@@ -1,84 +1,46 @@
 using System;
 using System.ComponentModel;
-using System.Resources;
 using System.Runtime.CompilerServices;
-using FModel.Properties;
 
-namespace FModel.Extensions
+namespace FModel.Extensions;
+
+public static class EnumExtensions
 {
-    public static class EnumExtensions
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string GetDescription(this Enum value)
     {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string GetDescription(this Enum value)
-        {
-            var fi = value.GetType().GetField(value.ToString());
-            if (fi == null) return $"{value} ({value:D})";
-            var attributes = (DescriptionAttribute[]) fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
-            return attributes.Length > 0 ? attributes[0].Description : $"{value} ({value:D})";
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string GetLocalizedDescription(this Enum value) => value.GetLocalizedDescription(Resources.ResourceManager);
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string GetLocalizedDescription(this Enum value, ResourceManager resourceManager)
-        {
-            var resourceName = value.GetType().Name + "_" + value;
-            var description = resourceManager.GetString(resourceName);
-
-            if (string.IsNullOrEmpty(description))
-            {
-                description = value.GetDescription();
-            }
-
-            return description;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string GetLocalizedCategory(this Enum value) => value.GetLocalizedCategory(Resources.ResourceManager);
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string GetLocalizedCategory(this Enum value, ResourceManager resourceManager)
-        {
-            var resourceName = value.GetType().Name + "_" + value + "_Category";
-            var description = resourceManager.GetString(resourceName);
-
-            return description;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T ToEnum<T>(this string value, T defaultValue) where T : struct
-        {
-            if (!Enum.TryParse(value, true, out T ret))
-                return defaultValue;
-
-            return ret;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static bool HasAnyFlags<T>(this T flags, T contains) where T : Enum, IConvertible => (flags.ToInt32(null) & contains.ToInt32(null)) != 0;
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetIndex(this Enum value)
-        {
-            var values = Enum.GetValues(value.GetType());
-            return Array.IndexOf(values, value);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T Next<T>(this Enum value)
-        {
-            var values = Enum.GetValues(value.GetType());
-            var i = Array.IndexOf(values, value) + 1;
-            return i == values.Length ? (T) values.GetValue(0) : (T) values.GetValue(i);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static T Previous<T>(this Enum value)
-        {
-            var values = Enum.GetValues(value.GetType());
-            var i = Array.IndexOf(values, value) - 1;
-            return i == -1 ? (T) values.GetValue(values.Length - 1) : (T) values.GetValue(i);
-        }
+        var fi = value.GetType().GetField(value.ToString());
+        if (fi == null) return $"{value} ({value:D})";
+        var attributes = (DescriptionAttribute[]) fi.GetCustomAttributes(typeof(DescriptionAttribute), false);
+        return attributes.Length > 0 ? attributes[0].Description : $"{value} ({value:D})";
     }
-}
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T ToEnum<T>(this string value, T defaultValue) where T : struct => !Enum.TryParse(value, true, out T ret) ? defaultValue : ret;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static bool HasAnyFlags<T>(this T flags, T contains) where T : Enum, IConvertible => (flags.ToInt32(null) & contains.ToInt32(null)) != 0;
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int GetIndex(this Enum value)
+    {
+        var values = Enum.GetValues(value.GetType());
+        return Array.IndexOf(values, value);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T Next<T>(this Enum value)
+    {
+        var values = Enum.GetValues(value.GetType());
+        var i = Array.IndexOf(values, value) + 1;
+        return i == values.Length ? (T) values.GetValue(0) : (T) values.GetValue(i);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static T Previous<T>(this Enum value)
+    {
+        var values = Enum.GetValues(value.GetType());
+        var i = Array.IndexOf(values, value) - 1;
+        return i == -1 ? (T) values.GetValue(values.Length - 1) : (T) values.GetValue(i);
+    }
+}

FModel/Extensions/StreamExtensions.cs

@@ -2,30 +2,29 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 
-namespace FModel.Extensions
+namespace FModel.Extensions;
+
+public enum Endianness
 {
-    public enum Endianness
-    {
-        LittleEndian,
-        BigEndian,
-    }
+    LittleEndian,
+    BigEndian
+}
 
-    public static class StreamExtensions
+public static class StreamExtensions
+{
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static uint ReadUInt32(this Stream s, Endianness endian = Endianness.LittleEndian)
     {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static uint ReadUInt32(this Stream s, Endianness endian = Endianness.LittleEndian)
+        var b1 = s.ReadByte();
+        var b2 = s.ReadByte();
+        var b3 = s.ReadByte();
+        var b4 = s.ReadByte();
+
+        return endian switch
         {
-            var b1 = s.ReadByte();
-            var b2 = s.ReadByte();
-            var b3 = s.ReadByte();
-            var b4 = s.ReadByte();
-
-            return endian switch
-            {
-                Endianness.LittleEndian => (uint) (b4 << 24 | b3 << 16 | b2 << 8 | b1),
-                Endianness.BigEndian => (uint) (b1 << 24 | b2 << 16 | b3 << 8 | b4),
-                _ => throw new Exception("unknown endianness")
-            };
-        }
+            Endianness.LittleEndian => (uint) (b4 << 24 | b3 << 16 | b2 << 8 | b1),
+            Endianness.BigEndian => (uint) (b1 << 24 | b2 << 16 | b3 << 8 | b4),
+            _ => throw new Exception("unknown endianness")
+        };
     }
 }

FModel/Extensions/StringExtensions.cs

@@ -2,133 +2,132 @@
 using System.IO;
 using System.Runtime.CompilerServices;
 
-namespace FModel.Extensions
+namespace FModel.Extensions;
+
+public static class StringExtensions
 {
-    public static class StringExtensions
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string GetReadableSize(double size)
     {
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string GetReadableSize(double size)
+        if (size == 0) return "0 B";
+
+        string[] sizes = { "B", "KB", "MB", "GB", "TB" };
+        var order = 0;
+        while (size >= 1024 && order < sizes.Length - 1)
         {
-            if (size == 0) return "0 B";
-
-            string[] sizes = {"B", "KB", "MB", "GB", "TB"};
-            var order = 0;
-            while (size >= 1024 && order < sizes.Length - 1)
-            {
-                order++;
-                size /= 1024;
-            }
-
-            return $"{size:# ###.##} {sizes[order]}".TrimStart();
+            order++;
+            size /= 1024;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringBefore(this string s, char delimiter)
+        return $"{size:# ###.##} {sizes[order]}".TrimStart();
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringBefore(this string s, char delimiter)
+    {
+        var index = s.IndexOf(delimiter);
+        return index == -1 ? s : s[..index];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringBefore(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
+    {
+        var index = s.IndexOf(delimiter, comparisonType);
+        return index == -1 ? s : s[..index];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringAfter(this string s, char delimiter)
+    {
+        var index = s.IndexOf(delimiter);
+        return index == -1 ? s : s.Substring(index + 1, s.Length - index - 1);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringAfter(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
+    {
+        var index = s.IndexOf(delimiter, comparisonType);
+        return index == -1 ? s : s.Substring(index + delimiter.Length, s.Length - index - delimiter.Length);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringBeforeLast(this string s, char delimiter)
+    {
+        var index = s.LastIndexOf(delimiter);
+        return index == -1 ? s : s[..index];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringBeforeLast(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
+    {
+        var index = s.LastIndexOf(delimiter, comparisonType);
+        return index == -1 ? s : s[..index];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringBeforeWithLast(this string s, char delimiter)
+    {
+        var index = s.LastIndexOf(delimiter);
+        return index == -1 ? s : s[..(index + 1)];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringBeforeWithLast(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
+    {
+        var index = s.LastIndexOf(delimiter, comparisonType);
+        return index == -1 ? s : s[..(index + 1)];
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringAfterLast(this string s, char delimiter)
+    {
+        var index = s.LastIndexOf(delimiter);
+        return index == -1 ? s : s.Substring(index + 1, s.Length - index - 1);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static string SubstringAfterLast(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
+    {
+        var index = s.LastIndexOf(delimiter, comparisonType);
+        return index == -1 ? s : s.Substring(index + delimiter.Length, s.Length - index - delimiter.Length);
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static int GetLineNumber(this string s, string lineToFind)
+    {
+        if (int.TryParse(lineToFind, out var index))
+            return s.GetLineNumber(index);
+
+        lineToFind = $"    \"Name\": \"{lineToFind}\",";
+        using var reader = new StringReader(s);
+        var lineNum = 0;
+        string line;
+        while ((line = reader.ReadLine()) != null)
         {
-            var index = s.IndexOf(delimiter);
-            return index == -1 ? s : s[..index];
+            lineNum++;
+            if (line.Equals(lineToFind, StringComparison.OrdinalIgnoreCase))
+                return lineNum;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringBefore(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
+        return 1;
+    }
+
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    private static int GetLineNumber(this string s, int index)
+    {
+        using var reader = new StringReader(s);
+        var lineNum = 0;
+        string line;
+        while ((line = reader.ReadLine()) != null)
         {
-            var index = s.IndexOf(delimiter, comparisonType);
-            return index == -1 ? s : s[..index];
+            lineNum++;
+            if (line.Equals("  {"))
+                index--;
+
+            if (index == -1)
+                return lineNum + 1;
         }
 
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringAfter(this string s, char delimiter)
-        {
-            var index = s.IndexOf(delimiter);
-            return index == -1 ? s : s.Substring(index + 1, s.Length - index - 1);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringAfter(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
-        {
-            var index = s.IndexOf(delimiter, comparisonType);
-            return index == -1 ? s : s.Substring(index + delimiter.Length, s.Length - index - delimiter.Length);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringBeforeLast(this string s, char delimiter)
-        {
-            var index = s.LastIndexOf(delimiter);
-            return index == -1 ? s : s[..index];
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringBeforeLast(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
-        {
-            var index = s.LastIndexOf(delimiter, comparisonType);
-            return index == -1 ? s : s[..index];
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringBeforeWithLast(this string s, char delimiter)
-        {
-            var index = s.LastIndexOf(delimiter);
-            return index == -1 ? s : s[..(index + 1)];
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringBeforeWithLast(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
-        {
-            var index = s.LastIndexOf(delimiter, comparisonType);
-            return index == -1 ? s : s[..(index + 1)];
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringAfterLast(this string s, char delimiter)
-        {
-            var index = s.LastIndexOf(delimiter);
-            return index == -1 ? s : s.Substring(index + 1, s.Length - index - 1);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static string SubstringAfterLast(this string s, string delimiter, StringComparison comparisonType = StringComparison.Ordinal)
-        {
-            var index = s.LastIndexOf(delimiter, comparisonType);
-            return index == -1 ? s : s.Substring(index + delimiter.Length, s.Length - index - delimiter.Length);
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        public static int GetLineNumber(this string s, string lineToFind)
-        {
-            if (int.TryParse(lineToFind, out var index))
-                return s.GetLineNumber(index);
-
-            lineToFind = $"    \"Name\": \"{lineToFind}\",";
-            using var reader = new StringReader(s);
-            var lineNum = 0;
-            string line;
-            while ((line = reader.ReadLine()) != null)
-            {
-                lineNum++;
-                if (line.Equals(lineToFind, StringComparison.OrdinalIgnoreCase))
-                    return lineNum;
-            }
-
-            return 1;
-        }
-
-        [MethodImpl(MethodImplOptions.AggressiveInlining)]
-        private static int GetLineNumber(this string s, int index)
-        {
-            using var reader = new StringReader(s);
-            var lineNum = 0;
-            string line;
-            while ((line = reader.ReadLine()) != null)
-            {
-                lineNum++;
-                if (line.Equals("  {"))
-                    index--;
-
-                if (index == -1)
-                    return lineNum + 1;
-            }
-
-            return 1;
-        }
+        return 1;
     }
 }