From 196c6e35073f465b1b7f86b2f6338abafa0323af Mon Sep 17 00:00:00 2001
From: YYHEggEgg <53960525+YYHEggEgg@users.noreply.github.com>
Date: Mon, 10 Jun 2024 09:24:35 +0800
Subject: [PATCH] Make Guardian in separate 'tool' folder to avoid skill issue

---
 .github/workflows/dotnet.yml | 4 +++-
 FireflySR.Tool.Proxy.csproj  | 4 ++--
 Program.cs                   | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index ae94ae7..80809ee 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -30,7 +30,9 @@ jobs:
     - name: Publish
       run: dotnet publish FireflySR.Tool.Proxy.csproj -c Release -r ${{ matrix.runtime-id }}
     - name: Remove .pdb debug symbols
-      run: rm bin/Release/net8.0/${{ matrix.runtime-id }}/publish/*.pdb
+      run: |
+        rm bin/Release/net8.0/${{ matrix.runtime-id }}/publish/*.pdb
+        rm bin/Release/net8.0/${{ matrix.runtime-id }}/publish/**/*.pdb
     - name: Upload
       uses: actions/upload-artifact@v4
       with:
diff --git a/FireflySR.Tool.Proxy.csproj b/FireflySR.Tool.Proxy.csproj
index 5d9ba71..3a362d7 100644
--- a/FireflySR.Tool.Proxy.csproj
+++ b/FireflySR.Tool.Proxy.csproj
@@ -30,8 +30,8 @@
   </ItemGroup>
 
   <Target Name="PreBuild" BeforeTargets="PreBuildEvent" Condition="$(Os) == 'Windows_NT'">
-	  <Exec Condition="$(RuntimeIdentifier) == ''" Command="echo ProjectDir: $(ProjectDir)&#xD;&#xA;echo Configuration: $(Configuration)&#xD;&#xA;echo OutDir: $(OutDir)&#xD;&#xA;echo Os: $(Os)&#xD;&#xA;echo RuntimeIdentifier: (unused)&#xD;&#xA;dotnet publish $(ProjectDir)\Guardian --configuration $(Configuration) --output $(OutDir)" />
-	  <Exec Condition="$(RuntimeIdentifier) != ''" Command="echo ProjectDir: $(ProjectDir)&#xD;&#xA;echo Configuration: $(Configuration)&#xD;&#xA;echo OutDir: $(OutDir)&#xD;&#xA;echo Os: $(Os)&#xD;&#xA;echo RuntimeIdentifier: $(RuntimeIdentifier)&#xD;&#xA;dotnet publish $(ProjectDir)\Guardian --configuration $(Configuration) --output $(OutDir)\publish" />
+	  <Exec Condition="$(RuntimeIdentifier) == ''" Command="echo ProjectDir: $(ProjectDir)&#xD;&#xA;echo Configuration: $(Configuration)&#xD;&#xA;echo OutDir: $(OutDir)&#xD;&#xA;echo Os: $(Os)&#xD;&#xA;echo RuntimeIdentifier: (unused)&#xD;&#xA;dotnet build $(ProjectDir)\Guardian --configuration $(Configuration) --output $(OutDir)\tool" />
+	  <Exec Condition="$(RuntimeIdentifier) != ''" Command="echo ProjectDir: $(ProjectDir)&#xD;&#xA;echo Configuration: $(Configuration)&#xD;&#xA;echo OutDir: $(OutDir)&#xD;&#xA;echo Os: $(Os)&#xD;&#xA;echo RuntimeIdentifier: $(RuntimeIdentifier)&#xD;&#xA;dotnet publish $(ProjectDir)\Guardian --configuration $(Configuration) --output $(OutDir)\publish\tool" />
   </Target>
  
 </Project>
diff --git a/Program.cs b/Program.cs
index c1eb078..0909a8b 100644
--- a/Program.cs
+++ b/Program.cs
@@ -9,7 +9,7 @@ namespace FireflySR.Tool.Proxy
         private const string Title = "FreeSR Proxy (Alter)";
         private const string ConfigPath = "config.json";
         private const string ConfigTemplatePath = "config.tmpl.json";
-        private const string GuardianPath = "FireflySR.Tool.Proxy.Guardian.exe";
+        private const string GuardianPath = "tool/FireflySR.Tool.Proxy.Guardian.exe";
 
         private static ProxyService s_proxyService = null!;
         private static bool s_clearupd = false;