diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 33556a4..26fe329 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -32,10 +32,10 @@ jobs: run: msbuild /m /p:Configuration=Release /p:Platform=x64 ${{env.PROJ_AGENT}} - name: Build Prospect.Launcher - run: dotnet publish -o ./build-app -r win-x64 -c Release -v minimal ${{env.PROJ_LAUNCHER}} + run: dotnet publish -o ./Prospect-Launcher -r win-x64 -c Release -v minimal ${{env.PROJ_LAUNCHER}} - name: Compress Prospect.Launcher - run: 7z a launcher.zip ./build-app/* + run: 7z a launcher.zip ./Prospect-Launcher - uses: actions/upload-artifact@v2 with: diff --git a/src/.gitignore b/src/.gitignore index 3c4efe2..a8c005d 100644 --- a/src/.gitignore +++ b/src/.gitignore @@ -1,3 +1,6 @@ +# Agent +Prospect.Agent.dll + ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. diff --git a/src/Prospect.Agent/Prospect.Agent.vcxproj b/src/Prospect.Agent/Prospect.Agent.vcxproj index a4b111e..f3726b5 100644 --- a/src/Prospect.Agent/Prospect.Agent.vcxproj +++ b/src/Prospect.Agent/Prospect.Agent.vcxproj @@ -47,13 +47,13 @@ true - $(SolutionDir)Prospect.Launcher\Libs + $(SolutionDir)Prospect.Launcher $(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\ $(LibraryPath) false - $(SolutionDir)Prospect.Launcher\Libs + $(SolutionDir)Prospect.Launcher $(ProjectDir)bin\intermediate\$(Platform)\$(Configuration)\ $(LibraryPath) diff --git a/src/Prospect.Launcher/Libs/Prospect.Agent.dll b/src/Prospect.Launcher/Libs/Prospect.Agent.dll deleted file mode 100644 index c5a69fc..0000000 Binary files a/src/Prospect.Launcher/Libs/Prospect.Agent.dll and /dev/null differ diff --git a/src/Prospect.Launcher/Program.cs b/src/Prospect.Launcher/Program.cs index 0c53df1..24848bf 100644 --- a/src/Prospect.Launcher/Program.cs +++ b/src/Prospect.Launcher/Program.cs @@ -60,7 +60,7 @@ namespace Prospect.Launcher Console.WriteLine("Spawned."); // Inject DLL. - var agentPath = Path.Combine(AppContext.BaseDirectory, "Libs", "Prospect.Agent.dll"); + var agentPath = Path.Combine(AppContext.BaseDirectory, "Prospect.Agent.dll"); if (!Inject.Library(processInfo.dwProcessId, agentPath)) { diff --git a/src/Prospect.Launcher/Prospect.Launcher.csproj b/src/Prospect.Launcher/Prospect.Launcher.csproj index 3595d26..93260f1 100644 --- a/src/Prospect.Launcher/Prospect.Launcher.csproj +++ b/src/Prospect.Launcher/Prospect.Launcher.csproj @@ -4,6 +4,11 @@ Exe net5.0 true + true + false + win-x64 + true + embedded @@ -15,13 +20,11 @@ - - - - - + PreserveNewest - + PreserveNewest + false +