Merge pull request #15 from ptr727/develop

Develop

Author: ptr727

.editorconfig

@@ -8,32 +8,39 @@
 # https://github.com/dotnet/runtime/blob/main/.editorconfig
 
 # https://learn.microsoft.com/en-us/dotnet/core/tools/dotnet-format
-# dotnet format --verify-no-changes --severity=info --verbosity=detailed
+# dotnet format style --verify-no-changes --severity=info --verbosity=detailed --exclude-diagnostics=IDE0055
 
 # Root config
 root = true
 
 # Defaults
 [*]
 charset = utf-8
-end_of_line = crlf
 indent_size = 4
 indent_style = space
 insert_final_newline = true
 trim_trailing_whitespace = true
 
 # Markdown files
 [*.{md}]
+end_of_line = crlf
 trim_trailing_whitespace = false
 
 # Xml files
 [*.{xml,csproj,props,targets}]
+end_of_line = crlf
 indent_size = 2
 
-# YAML files
+# Yaml files
 [*.{yml,yaml}]
+end_of_line = crlf
 indent_size = 2
 
+# Json files
+[*.json]
+end_of_line = crlf
+indent_size = 4
+
 # Linux scripts
 [*.sh]
 end_of_line = lf
@@ -44,10 +51,9 @@ end_of_line = crlf
 
 # C# files
 [*.cs]
-
-# Default to suggestion severity
+end_of_line = crlf
+dotnet_diagnostic.IDE0055.severity = none
 dotnet_analyzer_diagnostic.severity = suggestion
-
 csharp_indent_block_contents = true
 csharp_indent_braces = false
 csharp_indent_case_contents = true

.github/workflows/merge-bot-pr.yml

@@ -17,18 +17,14 @@ jobs:
       contents: write
       pull-requests: write
 
-    # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/automating-dependabot-with-github-actions#enable-auto-merge-on-a-pull-request
     steps:
 
-      # https://github.com/marketplace/actions/fetch-metadata-from-dependabot-prs
       - name: Get dependabot metadata
         id: metadata
         uses: dependabot/fetch-metadata@v2
         with:
           github-token: "${{ secrets.GITHUB_TOKEN }}"
 
-      # https://cli.github.com/manual/gh_pr_merge
-      # https://docs.github.com/en/code-security/dependabot/working-with-dependabot/dependabot-options-reference#ignore--
       - name: Merge dependabot non-major updates
         if: steps.metadata.outputs.update-type != 'version-update:semver-major'
         run: gh pr merge --auto --merge "$PR_URL"
@@ -46,7 +42,6 @@ jobs:
 
     steps:
 
-      # https://cli.github.com/manual/gh_pr_merge
       - name: Merge language data PR's
         run: gh pr merge --auto --merge "$PR_URL"
         env:

.github/workflows/publish-release.yml

@@ -3,8 +3,6 @@ name: Publish release
 on:
   push:
     branches: [ main, develop ]
-  pull_request:
-    branches: [ main, develop ]
   workflow_dispatch:
 
 concurrency:
@@ -14,34 +12,8 @@ concurrency:
 jobs:
 
   test:
-    name: Run tests
-    runs-on: ubuntu-latest
-
-    steps:
-
-      # https://github.com/marketplace/actions/setup-net-core-sdk
-      - name: Setup .NET SDK
-        uses: actions/setup-dotnet@v4
-        with:
-          dotnet-version: 9.x
-
-      # https://github.com/marketplace/actions/checkout
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      # https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-build
-      - name: Build
-        run: dotnet build
-
-        # https://docs.microsoft.com/en-us/dotnet/core/tools/dotnet-test
-      - name: Run unit tests
-        run: dotnet test ./LanguageTagsTests/LanguageTagsTests.csproj
-
-      - name: Format checks
-        run: |
-          dotnet tool restore
-          dotnet csharpier check --log-level=debug .
-          dotnet format --verify-no-changes --severity=info --verbosity=detailed
+    uses: ./.github/workflows/test.yml
+    secrets: inherit
 
   publish:
     name: Publish release

.github/workflows/test-pr.yml

@@ -0,0 +1,16 @@
+name: Test PRs
+
+on:
+  pull_request:
+    branches: [ main, develop ]
+  workflow_dispatch:
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+jobs:
+
+  test:
+    uses: ./.github/workflows/test.yml
+    secrets: inherit

.github/workflows/test.yml

@@ -0,0 +1,33 @@
+name: Test build
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+jobs:
+
+  test:
+    name: Run tests
+    runs-on: ubuntu-latest
+
+    steps:
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: 9.x
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Checks code style
+        run: |
+          dotnet tool restore
+          dotnet csharpier check --log-level=debug .
+          dotnet format style --verify-no-changes --severity=info --verbosity=detailed --exclude-diagnostics=IDE0055
+
+      - name: Run unit tests
+        run: dotnet test
+
+      - name: Build
+        run: dotnet build

.github/workflows/update-languagedata.yml

@@ -20,27 +20,24 @@ jobs:
 
     steps:
 
-      # https://github.com/marketplace/actions/setup-net-core-sdk
       - name: Setup .NET SDK
         uses: actions/setup-dotnet@v4
         with:
           dotnet-version: 9.x
 
-      # https://github.com/marketplace/actions/checkout
       - name: Checkout code
         uses: actions/checkout@v4
 
       - name: Download language data and generate code
         run: |
           dotnet run --project ./LanguageTagsCreate/LanguageTagsCreate.csproj -- .
 
-      - name: CSharpier format code
+      - name: Format code
         run: |
           dotnet tool restore
           dotnet csharpier format --log-level=debug .
           git status
 
-      # https://github.com/marketplace/actions/create-pull-request
       - name: Create pull request
         uses: peter-evans/create-pull-request@v7
         with:

.husky/task-runner.json

@@ -19,9 +19,11 @@
             "command": "dotnet",
             "args": [
                 "format",
+                "style",
                 "--verify-no-changes",
                 "--severity=info",
-                "--verbosity=detailed"
+                "--verbosity=detailed",
+                "--exclude-diagnostics=IDE0055"
             ],
             "include": [
                 "**/*.cs"

.vscode/tasks.json

@@ -28,9 +28,11 @@
             "command": "dotnet",
             "args": [
                 "format",
+                "style",
                 "--verify-no-changes",
                 "--severity=info",
-                "--verbosity=detailed"
+                "--verbosity=detailed",
+                "--exclude-diagnostics=IDE0055"
             ],
             "problemMatcher": [
                 "$msCompile"

LanguageData/iso6393

@@ -1297,7 +1297,7 @@ cli				I	L	Chakali
 clj				I	L	Laitu Chin	
 clk				I	L	Idu-Mishmi	
 cll				I	L	Chala	
-clm				I	L	Clallam	
+clm				I	L	Klallam	
 clo				I	L	Lowland Oaxaca Chontal	
 cls				I	H	Classical Sanskrit	
 clt				I	L	Lautu Chin	
@@ -1590,7 +1590,7 @@ diq				I	L	Dimli (individual language)
 dir				I	L	Dirim	
 dis				I	L	Dimasa	
 diu				I	L	Diriku	
-div	div	div	dv	I	L	Dhivehi	
+div	div	div	dv	I	L	Divehi	
 diw				I	L	Northwestern Dinka	
 dix				I	L	Dixon Reef	
 diy				I	L	Diuwe	
@@ -2325,7 +2325,7 @@ gyz				I	L	Geji
 gza				I	L	Ganza	
 gzi				I	L	Gazi	
 gzn				I	L	Gane	
-haa				I	L	Han	
+haa				I	L	Hän	
 hab				I	L	Hanoi Sign Language	
 hac				I	L	Gurani	
 had				I	L	Hatam	
@@ -3390,7 +3390,7 @@ kwg				I	L	Sara Kaba Deme
 kwh				I	L	Kowiai	
 kwi				I	L	Awa-Cuaiquer	
 kwj				I	L	Kwanga	
-kwk				I	L	Kwakiutl	
+kwk				I	L	Kwak'wala	
 kwl				I	L	Kofyar	
 kwm				I	L	Kwambi	
 kwn				I	L	Kwangali	
@@ -3795,7 +3795,7 @@ lup				I	L	Lumbu
 luq				I	L	Lucumi	
 lur				I	L	Laura	
 lus	lus	lus		I	L	Lushai	
-lut				I	L	Lushootseed	
+lut				I	E	Lushootseed	
 luu				I	L	Lumba-Yakkha	
 luv				I	L	Luwati	
 luw				I	L	Luo (Cameroon)	
@@ -4011,7 +4011,7 @@ mhj				I	L	Mogholi
 mhk				I	L	Mungaka	
 mhl				I	L	Mauwake	
 mhm				I	L	Makhuwa-Moniga	
-mhn				I	L	Mócheno	
+mhn				I	L	Mòcheno	
 mho				I	L	Mashi (Zambia)	
 mhp				I	L	Balinese Malay	
 mhq				I	L	Mandan	
@@ -4916,7 +4916,7 @@ nxo				I	L	Ndambomo
 nxq				I	L	Naxi	
 nxr				I	L	Ninggerum	
 nxx				I	L	Nafri	
-nya	nya	nya	ny	I	L	Nyanja	
+nya	nya	nya	ny	I	L	Chichewa	
 nyb				I	L	Nyangbo	
 nyc				I	L	Nyanga-li	
 nyd				I	L	Nyore	
@@ -7834,7 +7834,7 @@ zml				I	E	Matngala
 zmm				I	L	Marimanindji	
 zmn				I	L	Mbangwe	
 zmo				I	L	Molo	
-zmp				I	L	Mpuono	
+zmp				I	L	Mbuun	
 zmq				I	L	Mituku	
 zmr				I	L	Maranunggu	
 zms				I	L	Mbesa	

LanguageData/iso6393.json

@@ -7957,7 +7957,7 @@
       "Id": "clm",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "Clallam"
+      "RefName": "Klallam"
     },
     {
       "Id": "clo",
@@ -9756,7 +9756,7 @@
       "Part1": "dv",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "Dhivehi"
+      "RefName": "Divehi"
     },
     {
       "Id": "diw",
@@ -14294,7 +14294,7 @@
       "Id": "haa",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "Han"
+      "RefName": "H\u00E4n"
     },
     {
       "Id": "hab",
@@ -20854,7 +20854,7 @@
       "Id": "kwk",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "Kwakiutl"
+      "RefName": "Kwak\u0027wala"
     },
     {
       "Id": "kwl",
@@ -23332,7 +23332,7 @@
     {
       "Id": "lut",
       "Scope": "I",
-      "LanguageType": "L",
+      "LanguageType": "E",
       "RefName": "Lushootseed"
     },
     {
@@ -24658,7 +24658,7 @@
       "Id": "mhn",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "M\u00F3cheno"
+      "RefName": "M\u00F2cheno"
     },
     {
       "Id": "mho",
@@ -30186,7 +30186,7 @@
       "Part1": "ny",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "Nyanja"
+      "RefName": "Chichewa"
     },
     {
       "Id": "nyb",
@@ -48030,7 +48030,7 @@
       "Id": "zmp",
       "Scope": "I",
       "LanguageType": "L",
-      "RefName": "Mpuono"
+      "RefName": "Mbuun"
     },
     {
       "Id": "zmq",