Merge pull request #29 from nwn-dotnet/dotnet6

Further cleanup
nwn-dotnet · Oct 31, 2021 · db50f4f · db50f4f
2 parents 8569b2f + 921ff8c
commit db50f4f
Show file tree

Hide file tree

Showing 11 changed files with 867 additions and 898 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,89 @@
+
+[*]
+charset = utf-8
+end_of_line = crlf
+trim_trailing_whitespace = false
+insert_final_newline = false
+indent_style = space
+indent_size = 4
+
+# Microsoft .NET properties
+csharp_new_line_before_members_in_object_initializers = false
+csharp_new_line_before_open_brace = none
+csharp_preferred_modifier_order = public, private, protected, internal, new, abstract, virtual, sealed, override, static, readonly, extern, unsafe, volatile, async:suggestion
+csharp_style_var_elsewhere = true:suggestion
+csharp_style_var_for_built_in_types = true:suggestion
+csharp_style_var_when_type_is_apparent = true:suggestion
+dotnet_naming_rule.private_constants_rule.severity = warning
+dotnet_naming_rule.private_constants_rule.style = upper_camel_case_style
+dotnet_naming_rule.private_constants_rule.symbols = private_constants_symbols
+dotnet_naming_rule.private_instance_fields_rule.severity = warning
+dotnet_naming_rule.private_instance_fields_rule.style = lower_camel_case_style
+dotnet_naming_rule.private_instance_fields_rule.symbols = private_instance_fields_symbols
+dotnet_naming_rule.private_static_fields_rule.severity = warning
+dotnet_naming_rule.private_static_fields_rule.style = lower_camel_case_style
+dotnet_naming_rule.private_static_fields_rule.symbols = private_static_fields_symbols
+dotnet_naming_rule.private_static_readonly_rule.severity = warning
+dotnet_naming_rule.private_static_readonly_rule.style = upper_camel_case_style
+dotnet_naming_rule.private_static_readonly_rule.symbols = private_static_readonly_symbols
+dotnet_naming_style.lower_camel_case_style.capitalization = camel_case
+dotnet_naming_style.upper_camel_case_style.capitalization = pascal_case
+dotnet_naming_symbols.private_constants_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_constants_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_constants_symbols.required_modifiers = const
+dotnet_naming_symbols.private_instance_fields_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_instance_fields_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_static_fields_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_fields_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_static_fields_symbols.required_modifiers = static
+dotnet_naming_symbols.private_static_readonly_symbols.applicable_accessibilities = private
+dotnet_naming_symbols.private_static_readonly_symbols.applicable_kinds = field
+dotnet_naming_symbols.private_static_readonly_symbols.required_modifiers = static,readonly
+dotnet_style_parentheses_in_arithmetic_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_other_binary_operators = never_if_unnecessary:none
+dotnet_style_parentheses_in_relational_binary_operators = never_if_unnecessary:none
+dotnet_style_predefined_type_for_locals_parameters_members = true:suggestion
+dotnet_style_predefined_type_for_member_access = true:suggestion
+dotnet_style_qualification_for_event = false:suggestion
+dotnet_style_qualification_for_field = false:suggestion
+dotnet_style_qualification_for_method = false:suggestion
+dotnet_style_qualification_for_property = false:suggestion
+dotnet_style_require_accessibility_modifiers = for_non_interface_members:suggestion
+
+# ReSharper properties
+resharper_autodetect_indent_settings = true
+resharper_csharp_empty_block_style = together_same_line
+resharper_show_autodetect_configure_formatting_tip = false
+resharper_use_indent_from_vs = false
+
+# ReSharper inspection severities
+resharper_arrange_redundant_parentheses_highlighting = hint
+resharper_arrange_this_qualifier_highlighting = hint
+resharper_arrange_type_member_modifiers_highlighting = hint
+resharper_arrange_type_modifiers_highlighting = hint
+resharper_built_in_type_reference_style_for_member_access_highlighting = hint
+resharper_built_in_type_reference_style_highlighting = hint
+resharper_redundant_base_qualifier_highlighting = warning
+resharper_suggest_var_or_type_built_in_types_highlighting = hint
+resharper_suggest_var_or_type_elsewhere_highlighting = hint
+resharper_suggest_var_or_type_simple_types_highlighting = hint
+resharper_web_config_module_not_resolved_highlighting = warning
+resharper_web_config_type_not_resolved_highlighting = warning
+resharper_web_config_wrong_module_highlighting = warning
+
+[{*.har,*.inputactions,*.jsb2,*.jsb3,*.json,.babelrc,.eslintrc,.stylelintrc,bowerrc,jest.config}]
+indent_style = space
+indent_size = 2
+
+[{*.yaml,*.yml}]
+indent_style = space
+indent_size = 2
+
+[*.js.map]
+indent_style = space
+indent_size = 2
+
+[*.{appxmanifest,asax,ascx,aspx,axaml,build,cg,cginc,compute,cs,cshtml,dtd,fs,fsi,fsscript,fsx,hlsl,hlsli,hlslinc,master,ml,mli,nuspec,paml,razor,resw,resx,shader,skin,usf,ush,vb,xaml,xamlx,xoml,xsd}]
+indent_style = space
+indent_size = 4
+tab_width = 4
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,8 +26,6 @@ jobs:
         uses: anothrNick/[email protected]
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          DEFAULT_BUMP: patch
-          RELEASE_BRANCHES: master
           WITH_V: true
 
       - name: Prep Version String

diff --git a/API/src/Client.cs b/API/src/Client.cs
@@ -1,11 +1,11 @@
-using System.Net.Http;
-
-namespace NWN.MasterList {
-  public class Client {
-    public static HttpClient HttpClient { get; set; }
-
-    public Client() {
-      HttpClient = new HttpClient();
-    }
-  }
-}
+using System.Net.Http;
+
+namespace NWN.MasterList {
+    public class Client {
+        public static HttpClient HttpClient { get; set; }
+
+        public Client() {
+            HttpClient = new HttpClient();
+        }
+    }
+}
diff --git a/API/src/Data/Manifest.cs b/API/src/Data/Manifest.cs
@@ -1,10 +1,10 @@
-using System.Text.Json.Serialization;
-
-namespace NWN.MasterList.Data {
-  public struct Manifest {
-    [JsonPropertyName("required")]
-    public bool Required { get; set; }
-    [JsonPropertyName("hash")]
-    public string Hash { get; set; }
-  }
+using System.Text.Json.Serialization;
+
+namespace NWN.MasterList.Data {
+    public struct Manifest {
+        [JsonPropertyName("required")]
+        public bool Required { get; set; }
+        [JsonPropertyName("hash")]
+        public string Hash { get; set; }
+    }
 }
diff --git a/API/src/Data/Me.cs b/API/src/Data/Me.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace NWN.MasterList.Data {
-  public struct Me {
-    [JsonPropertyName("address")]
-    public string Address { get; set; }
-    [JsonPropertyName("servers")]
-    public List<NwServer> Servers { get; set; }
-  }
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace NWN.MasterList.Data {
+    public struct Me {
+        [JsonPropertyName("address")]
+        public string Address { get; set; }
+        [JsonPropertyName("servers")]
+        public List<NwServer> Servers { get; set; }
+    }
 }
diff --git a/API/src/Data/NwServer.cs b/API/src/Data/NwServer.cs
@@ -1,62 +1,62 @@
-using System.Text.Json.Serialization;
-
-namespace NWN.MasterList.Data {
-  public struct NwServer {
-    [JsonPropertyName("first_seen")]
-    public int FirstSeen { get; set; }
-    [JsonPropertyName("last_advertisement")]
-    public int LastAdvertisement { get; set; }
-    [JsonPropertyName("session_name")]
-    public string SessionName { get; set; }
-    [JsonPropertyName("module_name")]
-    public string ModuleName { get; set; }
-    [JsonPropertyName("module_description")]
-    public string ModuleDescription { get; set; }
-    [JsonPropertyName("passworded")]
-    public bool Passworded { get; set; }
-    [JsonPropertyName("min_level")]
-    public int MinLevel { get; set; }
-    [JsonPropertyName("max_level")]
-    public int MaxLevel { get; set; }
-    [JsonPropertyName("current_players")]
-    public int CurrentPlayers { get; set; }
-    [JsonPropertyName("max_players")]
-    public int MaxPlayers { get; set; }
-    [JsonPropertyName("build")]
-    public string Build { get; set; }
-    [JsonPropertyName("rev")]
-    public int Revision { get; set; }
-    [JsonPropertyName("pvp")]
-    public int PVP { get; set; }
-    [JsonPropertyName("servervault")]
-    public bool ServerVault { get; set; }
-    [JsonPropertyName("elc")]
-    public bool ELC { get; set; }
-    [JsonPropertyName("ilr")]
-    public bool ILR { get; set; }
-    [JsonPropertyName("one_party")]
-    public bool OneParty { get; set; }
-    [JsonPropertyName("player_pause")]
-    public bool PlayerPause { get; set; }
-    [JsonPropertyName("os")]
-    public int OS { get; set; }
-    [JsonPropertyName("language")]
-    public int Language { get; set; }
-    [JsonPropertyName("game_type")]
-    public int GameType { get; set; }
-    [JsonPropertyName("latency")]
-    public int Latency { get; set; }
-    [JsonPropertyName("host")]
-    public string IP { get; set; }
-    [JsonPropertyName("port")]
-    public int Port { get; set; }
-    [JsonPropertyName("kx_pk")]
-    public string KxPk { get; set; }
-    [JsonPropertyName("sign_pk")]
-    public string SignPk { get; set; }
-    [JsonPropertyName("connecthint")]
-    public string ConnectHint { get; set; }
-    [JsonPropertyName("nwsync")]
-    public NwSync NwSync { get; set; }
-  }
+using System.Text.Json.Serialization;
+
+namespace NWN.MasterList.Data {
+    public struct NwServer {
+        [JsonPropertyName("first_seen")]
+        public int FirstSeen { get; set; }
+        [JsonPropertyName("last_advertisement")]
+        public int LastAdvertisement { get; set; }
+        [JsonPropertyName("session_name")]
+        public string SessionName { get; set; }
+        [JsonPropertyName("module_name")]
+        public string ModuleName { get; set; }
+        [JsonPropertyName("module_description")]
+        public string ModuleDescription { get; set; }
+        [JsonPropertyName("passworded")]
+        public bool Passworded { get; set; }
+        [JsonPropertyName("min_level")]
+        public int MinLevel { get; set; }
+        [JsonPropertyName("max_level")]
+        public int MaxLevel { get; set; }
+        [JsonPropertyName("current_players")]
+        public int CurrentPlayers { get; set; }
+        [JsonPropertyName("max_players")]
+        public int MaxPlayers { get; set; }
+        [JsonPropertyName("build")]
+        public string Build { get; set; }
+        [JsonPropertyName("rev")]
+        public int Revision { get; set; }
+        [JsonPropertyName("pvp")]
+        public int PVP { get; set; }
+        [JsonPropertyName("servervault")]
+        public bool ServerVault { get; set; }
+        [JsonPropertyName("elc")]
+        public bool ELC { get; set; }
+        [JsonPropertyName("ilr")]
+        public bool ILR { get; set; }
+        [JsonPropertyName("one_party")]
+        public bool OneParty { get; set; }
+        [JsonPropertyName("player_pause")]
+        public bool PlayerPause { get; set; }
+        [JsonPropertyName("os")]
+        public int OS { get; set; }
+        [JsonPropertyName("language")]
+        public int Language { get; set; }
+        [JsonPropertyName("game_type")]
+        public int GameType { get; set; }
+        [JsonPropertyName("latency")]
+        public int Latency { get; set; }
+        [JsonPropertyName("host")]
+        public string IP { get; set; }
+        [JsonPropertyName("port")]
+        public int Port { get; set; }
+        [JsonPropertyName("kx_pk")]
+        public string KxPk { get; set; }
+        [JsonPropertyName("sign_pk")]
+        public string SignPk { get; set; }
+        [JsonPropertyName("connecthint")]
+        public string ConnectHint { get; set; }
+        [JsonPropertyName("nwsync")]
+        public NwSync NwSync { get; set; }
+    }
 }
diff --git a/API/src/Data/NwSync.cs b/API/src/Data/NwSync.cs
@@ -1,11 +1,11 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
-
-namespace NWN.MasterList.Data {
-  public struct NwSync {
-    [JsonPropertyName("manifests")]
-    public List<Manifest> Manifests { get; set; }
-    [JsonPropertyName("url")]
-    public string URL { get; set; }
-  }
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace NWN.MasterList.Data {
+    public struct NwSync {
+        [JsonPropertyName("manifests")]
+        public List<Manifest> Manifests { get; set; }
+        [JsonPropertyName("url")]
+        public string URL { get; set; }
+    }
 }