Resolve trim warnings

cf. https://learn.microsoft.com/dotnet/core/deploying/trimming/trim-warnings/il2026
npp-dotnet · Jan 9, 2025 · 592d5e3 · 592d5e3
1 parent 87a9739
commit 592d5e3
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 58 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -27,7 +27,7 @@ jobs:
         working-directory: Legacy-v2.1
 
       - name: Upload ${{ env.PLUGIN_NAME }}.${{ env.RELEASE_VERSION }}.win32
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: ${{ env.PLUGIN_NAME }}.${{ env.RELEASE_VERSION }}.win32
           path: |
@@ -46,7 +46,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-      - uses: actions/setup-dotnet@3e891b0cb619bf60e2c25674b222b8940e2c1c25 # v4.1.0
+      - uses: actions/setup-dotnet@87b7050bc53ea08284295505d98d2aa94301e852 # v4.2.0
         with:
           dotnet-version: 8.0.x
 
@@ -55,13 +55,15 @@ jobs:
           dotnet restore
           dotnet build -r win-${{ matrix.target_runtime }} -c Release
           dotnet publish -r win-${{ matrix.target_runtime }} -c Release
+          echo D | xcopy /DIY .\Resources Config
           echo F | xcopy /DVY .\bin\Release\net8.0-windows\win-${{ matrix.target_runtime }}\native\${{ env.PLUGIN_NAME }}.dll ${{ env.PLUGIN_NAME }}.dll
           echo "RELEASE_VERSION=$((Get-Item ${{ env.PLUGIN_NAME }}.dll).VersionInfo.FileVersion)" >> $env:GITHUB_ENV
         working-directory: WebEdit
 
       - name: Upload ${{ env.PLUGIN_NAME }}.${{ env.RELEASE_VERSION }}.${{ matrix.target_runtime }}
-        uses: actions/upload-artifact@b4b15b8c7c6ac21ea08fcf65892d2ee8f75cf882 # v4.4.3
+        uses: actions/upload-artifact@6f51ac03b9356f520e9adb1b1b7802705f340c2b # v4.5.0
         with:
           name: ${{ env.PLUGIN_NAME }}.${{ env.RELEASE_VERSION }}.${{ matrix.target_runtime }}
           path: |
-            WebEdit/bin/Release/net8.0-windows/win-${{ matrix.target_runtime }}/native/${{ env.PLUGIN_NAME }}.dll
+            WebEdit/${{ env.PLUGIN_NAME }}.dll
+            WebEdit/Config/
diff --git a/WebEdit/Actions.cs b/WebEdit/Actions.cs
@@ -30,56 +30,9 @@ private void ExecuteCommand(string command)
       //scintillaGateway.SetSelectionEnd(position + command.Substring(0, command.IndexOf('|')).Length);
     }
 
-    public void ExecuteCommand0() => ExecuteCommand(_commands[0]);
-    public void ExecuteCommand1() => ExecuteCommand(_commands[1]);
-    public void ExecuteCommand2() => ExecuteCommand(_commands[2]);
-    public void ExecuteCommand3() => ExecuteCommand(_commands[3]);
-    public void ExecuteCommand4() => ExecuteCommand(_commands[4]);
-    public void ExecuteCommand5() => ExecuteCommand(_commands[5]);
-    public void ExecuteCommand6() => ExecuteCommand(_commands[6]);
-    public void ExecuteCommand7() => ExecuteCommand(_commands[7]);
-    public void ExecuteCommand8() => ExecuteCommand(_commands[8]);
-    public void ExecuteCommand9() => ExecuteCommand(_commands[9]);
-    public void ExecuteCommand10() => ExecuteCommand(_commands[10]);
-    public void ExecuteCommand11() => ExecuteCommand(_commands[11]);
-    public void ExecuteCommand12() => ExecuteCommand(_commands[12]);
-    public void ExecuteCommand13() => ExecuteCommand(_commands[13]);
-    public void ExecuteCommand14() => ExecuteCommand(_commands[14]);
-    public void ExecuteCommand15() => ExecuteCommand(_commands[15]);
-    public void ExecuteCommand16() => ExecuteCommand(_commands[16]);
-    public void ExecuteCommand17() => ExecuteCommand(_commands[17]);
-    public void ExecuteCommand18() => ExecuteCommand(_commands[18]);
-    public void ExecuteCommand19() => ExecuteCommand(_commands[19]);
-    public void ExecuteCommand20() => ExecuteCommand(_commands[20]);
-    public void ExecuteCommand21() => ExecuteCommand(_commands[21]);
-    public void ExecuteCommand22() => ExecuteCommand(_commands[22]);
-    public void ExecuteCommand23() => ExecuteCommand(_commands[23]);
-    public void ExecuteCommand24() => ExecuteCommand(_commands[24]);
-    public void ExecuteCommand25() => ExecuteCommand(_commands[25]);
-    public void ExecuteCommand26() => ExecuteCommand(_commands[26]);
-    public void ExecuteCommand27() => ExecuteCommand(_commands[27]);
-    public void ExecuteCommand28() => ExecuteCommand(_commands[28]);
-    public void ExecuteCommand29() => ExecuteCommand(_commands[29]);
-    public void ExecuteCommand30() => ExecuteCommand(_commands[30]);
-    public void ExecuteCommand31() => ExecuteCommand(_commands[31]);
-    public void ExecuteCommand32() => ExecuteCommand(_commands[32]);
-    public void ExecuteCommand33() => ExecuteCommand(_commands[33]);
-    public void ExecuteCommand34() => ExecuteCommand(_commands[34]);
-    public void ExecuteCommand35() => ExecuteCommand(_commands[35]);
-    public void ExecuteCommand36() => ExecuteCommand(_commands[36]);
-    public void ExecuteCommand37() => ExecuteCommand(_commands[37]);
-    public void ExecuteCommand38() => ExecuteCommand(_commands[38]);
-    public void ExecuteCommand39() => ExecuteCommand(_commands[39]);
-    public void ExecuteCommand40() => ExecuteCommand(_commands[40]);
-    public void ExecuteCommand41() => ExecuteCommand(_commands[41]);
-    public void ExecuteCommand42() => ExecuteCommand(_commands[42]);
-    public void ExecuteCommand43() => ExecuteCommand(_commands[43]);
-    public void ExecuteCommand44() => ExecuteCommand(_commands[44]);
-    public void ExecuteCommand45() => ExecuteCommand(_commands[45]);
-    public void ExecuteCommand46() => ExecuteCommand(_commands[46]);
-    public void ExecuteCommand47() => ExecuteCommand(_commands[47]);
-    public void ExecuteCommand48() => ExecuteCommand(_commands[48]);
-    public void ExecuteCommand49() => ExecuteCommand(_commands[49]);
-    public void ExecuteCommand50() => ExecuteCommand(_commands[50]);
+    public PluginFunc GetCommand(int index)
+    {
+      return _commands.TryGetValue(index, out string cmdString) ? () => ExecuteCommand(cmdString) : null;
+    }
   }
 }
diff --git a/WebEdit/Main.cs b/WebEdit/Main.cs
@@ -48,14 +48,13 @@ public override void OnSetInfo()
       var ini = new IniFile(iniFilePath);
       var actions = new Actions(ini);
       foreach (string key in actions.iniKeys) {
-        var methodInfo = typeof(Actions).GetMethod("ExecuteCommand" + i++);
+        var methodInfo = actions.GetCommand(i++);
         if (methodInfo == null)
           break;
 
         Utils.SetCommand(
           key,
-          (PluginFunc) Delegate.CreateDelegate(
-            typeof(PluginFunc), actions, methodInfo.Name));
+          methodInfo);
       }
       Utils.SetCommand(
         "Replace Tag", ReplaceTag,