Merge pull request #37 from DiplomacyTeam/dev

v1.1.10 release

.editorconfig

@@ -0,0 +1,73 @@
+# To learn more about .editorconfig see https://aka.ms/editorconfigdocs
+###############################
+# Core EditorConfig Options   #
+###############################
+
+# All files
+[*]
+indent_style = space
+
+# Code files
+[*.{cs,vb}]
+indent_size = 4
+insert_final_newline = false
+charset = utf-8-bom
+
+# .NET formatting rules
+[*.{cs,vb}]
+dotnet_sort_system_directives_first = false
+dotnet_separate_import_directive_groups = true
+
+
+# CSharp formatting rules:
+[*.cs]
+csharp_new_line_before_open_brace = all
+csharp_new_line_before_else = true
+csharp_new_line_before_catch = true
+csharp_new_line_before_finally = true
+csharp_new_line_before_members_in_object_initializers = true
+csharp_new_line_before_members_in_anonymous_types = true
+csharp_new_line_between_query_expression_clauses = true
+
+# CSharp formatting rules:
+[*.cs]
+csharp_indent_case_contents = true
+csharp_indent_switch_labels = true
+csharp_indent_labels = one_less_than_current
+csharp_indent_block_contents = true
+csharp_indent_braces = false
+csharp_indent_case_contents_when_block = false
+
+# CSharp formatting rules:
+[*.cs]
+csharp_space_after_cast = true
+csharp_space_after_keywords_in_control_flow_statements = true
+csharp_space_between_parentheses =
+csharp_space_before_colon_in_inheritance_clause = true
+csharp_space_after_colon_in_inheritance_clause = true
+csharp_space_around_binary_operators = before_and_after
+csharp_space_between_method_declaration_parameter_list_parentheses = false
+csharp_space_between_method_declaration_empty_parameter_list_parentheses = false
+csharp_space_between_method_declaration_name_and_open_parenthesis = false
+csharp_space_between_method_call_parameter_list_parentheses = false
+csharp_space_between_method_call_empty_parameter_list_parentheses = false
+csharp_space_between_method_call_name_and_opening_parenthesis = false
+csharp_space_after_comma = true
+csharp_space_before_comma = false
+csharp_space_after_dot = false
+csharp_space_before_dot = false
+csharp_space_after_semicolon_in_for_statement = true
+csharp_space_before_semicolon_in_for_statement = false
+csharp_space_around_declaration_statements = false
+csharp_space_before_open_square_brackets = false
+csharp_space_between_empty_square_brackets = false
+csharp_space_between_square_brackets = false
+
+# CSharp formatting rules:
+[*.cs]
+csharp_preserve_single_line_statements = true
+csharp_preserve_single_line_blocks = true
+
+# 'using' directive preferences
+[*.cs]
+csharp_using_directive_placement = outside_namespace

.github/dependabot.yml

@@ -0,0 +1,16 @@
+version: 2
+updates:
+  - package-ecosystem: "nuget"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    ignore:
+      - dependency-name: "Newtonsoft.Json"
+      - dependency-name: "Bannerlord.ReferenceAssemblies.*"
+      - dependency-name: "Lib.Harmony"
+      - dependency-name: "Microsoft.Extensions.*"
+
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

.github/workflows/TestBuild.yml

@@ -2,8 +2,15 @@ name: TestBuild
 
 on:
   push:
+    branches-ignore:
+      - main
+  pull_request:
     branches:
+      - main
       - dev
+    # hopefully will be triggered more often
+    types: [assigned, opened, edited, reopened, review_requested, ready_for_review]      
+  workflow_dispatch:
 
 env:
   # Disable the .NET logo in the console output.
@@ -20,27 +27,26 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
       with:
         dotnet-version: 5.0.x
 
-    - name: Build Diplomacy Module
+    - name: Build Diplomacy Module for testing
       run: |
         $impl = $PWD.Path + '/bannerlord-implementations';
         $path = $PWD.Path + '/bannerlord';
         $final = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/';
-        $proj = 'src/Bannerlord.Diplomacy.csproj';
+        $proj = 'src/Bannerlord.Diplomacy/Bannerlord.Diplomacy.csproj';
         $pdll = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.dll';
         $ppdb = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
         # The folders are required to be created before executing the script
         New-Item -ItemType directory -Force -Path $impl;
         New-Item -ItemType directory -Force -Path $path;
-        $gameversions = Get-Content -Path supported-game-versions.txt;
-        # Get all implementations except the minimal version (last element)
-        # Last entry is the Minimal version. We will use Bannerlord.Diplomacy.dll from there
+        [string[]]$gameversions = Get-Content -Path supported-game-versions.txt;
+        # Process all implementations
         For ($i = 0; $i -le $gameversions.Length - 1; $i++)
         {
             $gameversion = $gameversions[$i];

.github/workflows/build.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3.0.2
 
     - name: Setup .NET Core
       uses: actions/setup-dotnet@master
@@ -32,15 +32,14 @@ jobs:
         $impl = $PWD.Path + '/bannerlord-implementations';
         $path = $PWD.Path + '/bannerlord';
         $final = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/';
-        $proj = 'src/Bannerlord.Diplomacy.csproj';
+        $proj = 'src/Bannerlord.Diplomacy/Bannerlord.Diplomacy.csproj';
         $pdll = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.dll';
         $ppdb = $path + '/Modules/Bannerlord.Diplomacy/bin/Win64_Shipping_Client/Bannerlord.Diplomacy*.pdb';
         # The folders are required to be created before executing the script
         New-Item -ItemType directory -Force -Path $impl;
         New-Item -ItemType directory -Force -Path $path;
-        $gameversions = Get-Content -Path supported-game-versions.txt;
-        # Get all implementations except the minimal version (last element)
-        # Last entry is the Minimal version. We will use Bannerlord.Diplomacy.dll from there
+        [string[]]$gameversions = Get-Content -Path supported-game-versions.txt;
+        # Process all implementations
         For ($i = 0; $i -le $gameversions.Length - 1; $i++)
         {
             $gameversion = $gameversions[$i];
@@ -62,7 +61,7 @@ jobs:
       shell: pwsh
 
     - name: Upload bannerlord folder
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3.1.0
       with:
         name: Bannerlord.Diplomacy
         path: ./bannerlord/Modules/
@@ -81,7 +80,7 @@ jobs:
         github-token: ${{secrets.GITHUB_TOKEN}}
 
     - name: Download stable bannerlord folder
-      uses: actions/download-artifact@v2
+      uses: actions/download-artifact@v3
       with:
         name: Bannerlord.Diplomacy
         path: ./bannerlord/Modules/

.github/workflows/dotnet-format-daily.yml

@@ -0,0 +1,18 @@
+name: Daily Code Format Check
+
+on:
+  schedule:
+    - cron: 0 0 * * * # Every day at midnight (UTC)
+  workflow_dispatch:
+
+jobs:
+  dotnet-format:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Code Formatting
+        uses: butr/[email protected]
+        with:
+          workspace: "src/Bannerlord.Diplomacy.sln"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          assignees: 'artifixer, Katarn2000x, zijistark'
+          reviewers: 'artifixer, Katarn2000x, zijistark'