Extension cleanup

extensions/CLib/CLib/ArmaRequest.cs

@@ -1,26 +1,22 @@
 using System;
 
-namespace CLib
-{
-    public class ArmaRequest
-    {
+namespace CLib {
+    public class ArmaRequest {
         public int TaskId { get; private set; }
         public string ExtensionName { get; private set; }
         public string ActionName { get; private set; }
         public string Data { get; private set; }
 
-        public static ArmaRequest Parse(string input)
-        {
-            int headerStart = input.IndexOf(ControlCharacter.SOH);
-            int textStart = input.IndexOf(ControlCharacter.STX);
-            int textEnd = input.IndexOf(ControlCharacter.ETX);
+        public static ArmaRequest Parse(string input) {
+            var headerStart = input.IndexOf(ControlCharacter.SOH);
+            var textStart = input.IndexOf(ControlCharacter.STX);
+            var textEnd = input.IndexOf(ControlCharacter.ETX);
 
-            string header = input.Substring(headerStart < 0 ? 0 : headerStart + 1, (textStart < 0 ? input.Length : textStart) - 1);
-            string[] headerValues = header.Split(new [] { ControlCharacter.US }, 3);
+            var header = input.Substring(headerStart < 0 ? 0 : headerStart + 1, (textStart < 0 ? input.Length : textStart) - 1);
+            var headerValues = header.Split(new [] { ControlCharacter.US }, 3);
 
             var request = new ArmaRequest();
-            int taskId;
-            if (!int.TryParse(headerValues[0], out taskId))
+            if (!int.TryParse(headerValues[0], out var taskId))
                 throw new ArgumentException($"Invalid task id: {headerValues[0]}");
             request.TaskId = taskId;
             request.ExtensionName = headerValues[1].Trim();

extensions/CLib/CLib/CLib.csproj

@@ -9,9 +9,10 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>CLib</RootNamespace>
     <AssemblyName>CLib_x64</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
+    <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <AssemblyName>CLib_x64</AssemblyName>

extensions/CLib/CLib/ControlCharacter.cs

@@ -1,7 +1,6 @@
-namespace CLib
-{
-    public struct ControlCharacter
-    {
+namespace CLib {
+    public struct ControlCharacter {
+        // ReSharper disable InconsistentNaming
         public const char SOH = '\x01';
         public const char STX = '\x02';
         public const char ETX = '\x03';

extensions/CLib/CLib/Debugger.cs

@@ -1,20 +1,10 @@
 using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
-namespace CLib
-{
-    public partial class Debugger : Form
-    {
-        public Debugger()
-        {
-            InitializeComponent();
+namespace CLib {
+    public partial class Debugger : Form {
+        public Debugger() {
+            this.InitializeComponent();
 
 #if Debug
             this.Show();
@@ -23,70 +13,44 @@ public Debugger()
 #endif
         }
 
-        public void Toggle()
-        {
-            if (this.rtb_log.InvokeRequired)
-            {
-                try
-                {
-                    this.rtb_log.Invoke(new Action(delegate
-                    {
-                        this.Toggle();
-                    }));
-                }
-                catch (ObjectDisposedException) {}
+        public void Toggle() {
+            if (this.rtb_log.InvokeRequired) {
+                try {
+                    this.rtb_log.Invoke(new Action(this.Toggle));
+                } catch (ObjectDisposedException) {}
                 return;
             }
 
-            if (this.Visible)
-            {
+            if (this.Visible) {
                 this.Hide();
-            }
-            else
-            {
+            } else {
                 this.Show();
             }
         }
 
-        public void Log(object obj)
-        {
-            if (this.rtb_log.InvokeRequired)
-            {
-                try
-                {
-                    this.rtb_log.Invoke(new Action(delegate {
-                        this.Log(obj);
-                    }));
-                }
-                catch (ObjectDisposedException) {}
+        public void Log(object obj) {
+            if (this.rtb_log.InvokeRequired) {
+                try {
+                    this.rtb_log.Invoke(new Action(delegate { this.Log(obj); }));
+                } catch (ObjectDisposedException) {}
                 return;
             }
 
-            this.rtb_log.AppendText(obj.ToString() + "\n");
+            this.rtb_log.AppendText(obj + "\n");
         }
 
-        protected override void OnFormClosing(FormClosingEventArgs e)
-        {
-            if (this.rtb_log.InvokeRequired)
-            {
-                try
-                {
-                    this.rtb_log.Invoke(new Action(delegate
-                    {
-                        this.OnFormClosing(e);
-                    }));
-                }
-                catch (ObjectDisposedException) {}
+        protected override void OnFormClosing(FormClosingEventArgs e) {
+            if (this.rtb_log.InvokeRequired) {
+                try {
+                    this.rtb_log.Invoke(new Action(delegate { this.OnFormClosing(e); }));
+                } catch (ObjectDisposedException) {}
                 return;
             }
 
-            if (e.CloseReason != CloseReason.UserClosing)
-            {
+            if (e.CloseReason != CloseReason.UserClosing) {
                 this.Dispose(true);
                 Application.Exit();
-            }
-            else
-            {
+            } else {
                 this.Hide();
             }
         }