Merge pull request #102 : fix(discord): add missing Dapper.AOT reference to DiscordBot project

fix(discord): add missing Dapper.AOT reference to DiscordBot project Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
fix(discord): add missing Dapper.AOT reference to DiscordBot project
2026-05-26 12:32:26 +03:00 · 2026-05-26 12:20:56 +03:00 · 2026-05-26 11:46:55 +03:00
8 changed files with 30 additions and 19 deletions
@@ -6,7 +6,7 @@ on:
      - main 

 env:
-  VERSION: 3.0.8
+  VERSION: 3.0.9

 jobs:
  # ЧАСТЬ 1: Собираем образы и кладем в Gitea (чтобы делиться с ребятами)
@@ -1,6 +1,6 @@
 <Project>
  <PropertyGroup>
-    <Version>3.0.8</Version>
+    <Version>3.0.9</Version>
    <TargetFramework>net10.0</TargetFramework>
    <LangVersion>preview</LangVersion>
    <Nullable>enable</Nullable>
@@ -49,7 +49,7 @@ services:
        crond -f

  bot:
-    image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.8
+    image: git.codeanddice.ru/toutsu/gmrelay-bot:3.0.9
    restart: always
    depends_on:
      db:
@@ -67,7 +67,7 @@ services:
      retries: 3

  discord:
-    image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.8
+    image: git.codeanddice.ru/toutsu/gmrelay-discord-bot:3.0.9
    restart: always
    depends_on:
      db:
@@ -84,7 +84,7 @@ services:
      retries: 3

  web:
-    image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.8
+    image: git.codeanddice.ru/toutsu/gmrelay-web:3.0.9
    restart: always
    depends_on:
      db:
@@ -6,11 +6,14 @@
    <Nullable>enable</Nullable>
    <ImplicitUsings>enable</ImplicitUsings>
    <UserSecretsId>dotnet-GmRelay.DiscordBot-issue-26</UserSecretsId>
+    <!-- DiscordBot uses vanilla Dapper in its own handlers; DAP005 requires AOT-enabled Dapper -->
+    <NoWarn>$(NoWarn);DAP005</NoWarn>
  </PropertyGroup>

  <ItemGroup>
    <PackageReference Include="Aspire.Npgsql" Version="13.2.2" />
    <PackageReference Include="Dapper" Version="2.1.72" />
+    <PackageReference Include="Dapper.AOT" Version="1.0.48" />
    <PackageReference Include="Microsoft.Extensions.Hosting" Version="10.0.5" />
    <PackageReference Include="NetCord.Hosting" Version="1.0.0-alpha.489" />
    <PackageReference Include="NetCord.Hosting.Services" Version="1.0.0-alpha.489" />
@@ -28,6 +28,12 @@
        "resolved": "2.1.72",
        "contentHash": "ns4mGqQd9a/MhP8m6w556vVlZIa0/MfUu03zrxjZC/jlr1uVCsUac8bkdB+Fs98Llbd56rRSo1eZH5VVmeGZyw=="
      },
+      "Dapper.AOT": {
+        "type": "Direct",
+        "requested": "[1.0.48, )",
+        "resolved": "1.0.48",
+        "contentHash": "rsLM3yKr4g+YKKox9lhc8D+kz67P7Q9+xdyn1LmCsoYr1kYpJSm+Nt6slo5UrfUrcTiGJ57zUlyO8XUdV7G7iA=="
+      },
      "Microsoft.Extensions.Hosting": {
        "type": "Direct",
        "requested": "[10.0.5, )",
@@ -73,7 +73,7 @@
                    </button>
                </form>

-                <div class="nav-version">v3.0.8</div>
+                <div class="nav-version">v3.0.9</div>
            </div>
        </Authorized>
        <NotAuthorized>
@@ -40,6 +40,7 @@ public sealed class DiscordProjectStructureTests
        Assert.Contains("GmRelay.Shared.csproj", project);
        Assert.DoesNotContain("Telegram.Bot", project);
        Assert.DoesNotContain("GmRelay.Bot.csproj", project);
+        Assert.Contains("Dapper.AOT", project);
    }

    [Fact]
@@ -61,7 +62,7 @@ public sealed class DiscordProjectStructureTests
        var prChecks = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "pr-checks.yml"));
        var deploy = File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml"));

-        Assert.Contains("gmrelay-discord-bot:3.0.8", compose);
+        Assert.Contains("gmrelay-discord-bot:3.0.9", compose);
        Assert.Contains("Discord__Token=${DISCORD_BOT_TOKEN:?Set DISCORD_BOT_TOKEN in .env}", compose);
        Assert.Contains("src/GmRelay.DiscordBot/Dockerfile", deploy);
        Assert.Contains("DISCORD_BOT_TOKEN", deploy);
@@ -75,13 +76,13 @@ public sealed class DiscordProjectStructureTests
    {
        var repoRoot = GetRepoRoot();

-        Assert.Contains("<Version>3.0.8</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
-        Assert.Contains("VERSION: 3.0.8", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
-        Assert.Contains("gmrelay-bot:3.0.8", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
-        Assert.Contains("gmrelay-web:3.0.8", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
-        Assert.Contains("gmrelay-discord-bot:3.0.8", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("<Version>3.0.9</Version>", File.ReadAllText(Path.Combine(repoRoot, "Directory.Build.props")));
+        Assert.Contains("VERSION: 3.0.9", File.ReadAllText(Path.Combine(repoRoot, ".gitea", "workflows", "deploy.yml")));
+        Assert.Contains("gmrelay-bot:3.0.9", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-web:3.0.9", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
+        Assert.Contains("gmrelay-discord-bot:3.0.9", File.ReadAllText(Path.Combine(repoRoot, "compose.yaml")));
        Assert.Contains(
-            "v3.0.8",
+            "v3.0.9",
            File.ReadAllText(Path.Combine(repoRoot, "src", "GmRelay.Web", "Components", "Layout", "NavMenu.razor")));
    }

@@ -392,8 +392,8 @@
          "Aspire.Npgsql": "[13.2.2, )",
          "Dapper": "[2.1.72, )",
          "Dapper.AOT": "[1.0.48, )",
-          "GmRelay.ServiceDefaults": "[2.5.0, )",
-          "GmRelay.Shared": "[2.5.0, )",
+          "GmRelay.ServiceDefaults": "[3.0.9, )",
+          "GmRelay.Shared": "[3.0.9, )",
          "Npgsql": "[10.0.2, )",
          "Telegram.Bot": "[22.9.5.3, )",
          "dbup-postgresql": "[7.0.1, )"
@@ -404,8 +404,9 @@
        "dependencies": {
          "Aspire.Npgsql": "[13.2.2, )",
          "Dapper": "[2.1.72, )",
-          "GmRelay.ServiceDefaults": "[2.5.0, )",
-          "GmRelay.Shared": "[2.5.0, )",
+          "Dapper.AOT": "[1.0.48, )",
+          "GmRelay.ServiceDefaults": "[3.0.9, )",
+          "GmRelay.Shared": "[3.0.9, )",
          "NetCord.Hosting": "[1.0.0-alpha.489, )",
          "NetCord.Hosting.Services": "[1.0.0-alpha.489, )",
          "NetCord.Services": "[1.0.0-alpha.489, )",
@@ -436,8 +437,8 @@
        "dependencies": {
          "Aspire.Npgsql": "[13.2.2, )",
          "Dapper": "[2.1.72, )",
-          "GmRelay.ServiceDefaults": "[2.5.0, )",
-          "GmRelay.Shared": "[2.5.0, )",
+          "GmRelay.ServiceDefaults": "[3.0.9, )",
+          "GmRelay.Shared": "[3.0.9, )",
          "Npgsql": "[10.0.2, )",
          "Telegram.Bot": "[22.9.6.1, )"
        }
Author	SHA1	Message	Date
Toutsu	a9aa84af0f	Merge pull request #102 : fix(discord): add missing Dapper.AOT reference to DiscordBot project Deploy Telegram Bot / build-and-push (push) Successful in 5m58s Details Deploy Telegram Bot / scan-images (push) Successful in 3m19s Details Deploy Telegram Bot / deploy (push) Successful in 35s Details fix(discord): add missing Dapper.AOT reference to DiscordBot project Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-26 12:32:26 +03:00
Toutsu	dcbd9bab41	fix(discord): add missing Dapper.AOT reference to DiscordBot project PR Checks / test-and-build (pull_request) Successful in 11m4s Details GmRelay.Shared references Dapper.AOT with PrivateAssets=all, which prevents the runtime DLL from flowing to downstream projects. Telegram bot works because it explicitly references Dapper.AOT directly, but Discord bot did not — causing FileNotFoundException for Dapper.AOT at runtime, breaking the scheduler and slash commands. - Add Dapper.AOT 1.0.48 to GmRelay.DiscordBot.csproj - Add regression test: DiscordWorkerProject_ShouldExist asserts Dapper.AOT is present in the DiscordBot csproj - Bump version → 3.0.9 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-26 12:20:56 +03:00
Toutsu	92d5d9c2d3	Merge pull request #101 : fix(discord): add console logging and deferred responses Deploy Telegram Bot / build-and-push (push) Successful in 5m56s Details Deploy Telegram Bot / scan-images (push) Successful in 3m3s Details Deploy Telegram Bot / deploy (push) Successful in 31s Details fix(discord): add console logging and deferred responses Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-26 11:46:55 +03:00