Merge pull request #15 from davidrule/Main-w/Icon

x32DBg support + fix some issues.

Reviewed and merged.

Author: AgentSmithers

.gitattributes

@@ -0,0 +1,5 @@
+DotNetPlugin.Impl/DotNetPlugin.Impl.csproj merge=ours
+DotNetPlugin.Stub/PluginMain.cs merge=ours
+DotNetPlugin.Stub/Attributes.DllExport.cs merge=ours
+.github/workflows/build-x86.yml merge=ours
+.github/workflows/build-x64.yml merge=ours

.github/workflows/build-x64.yml

@@ -0,0 +1,50 @@
+name: Build x64 Plugin
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - '**/*.cs'
+      - '**/*.csproj'
+      - 'Directory.Build.props'
+      - '.github/workflows/build-x64.yml'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      NUGET_PACKAGES: ${{ github.workspace }}\\packages
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Restore
+        run: msbuild x64DbgMCPServer.sln /t:Restore /p:Platform=x64 /p:Configuration=Debug /p:RestorePackagesPath="${{ env.NUGET_PACKAGES }}" /p:BaseIntermediateOutputPath=.cache\\obj\\
+
+      - name: Build x64 Debug
+        run: msbuild x64DbgMCPServer.sln /t:Rebuild /p:Platform=x64 /p:Configuration=Debug /p:RestorePackagesPath="${{ env.NUGET_PACKAGES }}" /p:BaseIntermediateOutputPath=.cache\\obj\\ /p:BaseOutputPath=.cache\\bin\\
+
+      - name: Upload artifact (dp64)
+        uses: actions/upload-artifact@v4
+        with:
+          name: AgentSmithers_x64DbgMCP_x64Plugin
+          path: |
+            bin\\x64\\Debug\\**\\*.dp64
+            bin\\x64\\Debug\\**\\*.dll
+            bin\\x64\\Debug\\**\\*.pdb
+          if-no-files-found: error
+
+      - name: Cleanup caches
+        if: always()
+        run: |
+          Remove-Item -Recurse -Force .cache -ErrorAction SilentlyContinue
+          Remove-Item -Recurse -Force packages -ErrorAction SilentlyContinue
+

.github/workflows/build-x86.yml

@@ -0,0 +1,49 @@
+name: Build x86 Plugin
+
+on:
+  workflow_dispatch:
+  push:
+    paths:
+      - '**/*.cs'
+      - '**/*.csproj'
+      - 'Directory.Build.props'
+      - '.github/workflows/build-x86.yml'
+
+jobs:
+  build:
+    runs-on: windows-latest
+    env:
+      NUGET_PACKAGES: ${{ github.workspace }}\\packages
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup MSBuild
+        uses: microsoft/setup-msbuild@v2
+
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Restore
+        run: msbuild x64DbgMCPServer.sln /t:Restore /p:Platform=x86 /p:Configuration=Debug /p:RestorePackagesPath="${{ env.NUGET_PACKAGES }}" /p:BaseIntermediateOutputPath=.cache\\obj\\
+
+      - name: Build x86 Debug
+        run: msbuild x64DbgMCPServer.sln /t:Rebuild /p:Platform=x86 /p:Configuration=Debug /p:RestorePackagesPath="${{ env.NUGET_PACKAGES }}" /p:BaseIntermediateOutputPath=.cache\\obj\\ /p:BaseOutputPath=.cache\\bin\\
+
+      - name: Upload artifact (dp32)
+        uses: actions/upload-artifact@v4
+        with:
+          name: AgentSmithers_x64DbgMCP_x32Plugin
+          path: |
+            bin\\x86\\Debug\\**\\*.dp32
+            bin\\x86\\Debug\\**\\*.dll
+            bin\\x86\\Debug\\**\\*.pdb
+          if-no-files-found: error
+
+      - name: Cleanup caches
+        if: always()
+        run: |
+          Remove-Item -Recurse -Force .cache -ErrorAction SilentlyContinue
+          Remove-Item -Recurse -Force packages -ErrorAction SilentlyContinue

.gitignore

@@ -388,4 +388,9 @@ FodyWeavers.xsd
 *.sln.iml
 
 !DotNetPlugin.Impl/NativeBindings/Win32/
-!DotNetPlugin.Stub/NativeBindings/Win32/
+!DotNetPlugin.Stub/NativeBindings/Win32/
+
+# CI and local build caches
+.cache/
+**/.cache/
+packages/

Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <PluginName>AgentSmithersx64dbgMCPServer</PluginName>
+    <PluginName>MCP - Agent Smithers</PluginName>
     <PluginAssemblyName>x64DbgMCPServer</PluginAssemblyName>
 
     <PluginRootNamespace>DotNetPlugin</PluginRootNamespace>

DotNetPlugin.Impl/DotNetPlugin.Impl.csproj

@@ -35,6 +35,9 @@
   <ItemGroup>
     <PackageReference Include="ILRepack.Lib.MSBuild.Task" Version="2.0.18.2" />
     <PackageReference Include="System.Text.Json" Version="9.0.4" />
+    <PackageReference Include="UnmanagedExports.Repack" Version="1.0.4">
+      <IncludeAssets>build</IncludeAssets>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -87,7 +90,13 @@
   </Target>
 
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="xcopy /Y /I &quot;$(TargetDir)*.*&quot; &quot;C:\Users\User\Desktop\x96\release\x64\plugins\x64DbgMCPServer&quot;&#xD;&#xA;rem start cmd /c C:\Users\User\Desktop\x96\release\x96dbg.exe" />
+    <!-- You can update the path to x96dbg here -->
+    <PropertyGroup>
+      <X96DbgRootPath>C:\Users\User\Desktop\x96\release</X96DbgRootPath>
+    </PropertyGroup>
+    
+    <Exec Condition="'$(Platform)'=='x64' AND Exists('$(X96DbgRootPath)')" Command="xcopy /Y /I &quot;$(TargetDir)*.*&quot; &quot;$(X96DbgRootPath)\x64\plugins\x64DbgMCPServer&quot;" />
+    <Exec Condition="'$(Platform)'=='x86' AND Exists('$(X96DbgRootPath)')" Command="xcopy /Y /I &quot;$(TargetDir)*.*&quot; &quot;$(X96DbgRootPath)\x32\plugins\x64DbgMCPServer&quot;" />
   </Target>
 
 </Project>