From 0096a1a4efcfbe3e6be4e63c291a162fcdcc21ac Mon Sep 17 00:00:00 2001
From: chylex <contact@chylex.com>
Date: Thu, 26 Apr 2018 15:37:02 +0200
Subject: [PATCH] Move debug configuration build events to PostBuild script
---
Resources/PostBuild.ps1 | 8 +++++++-
Resources/ScriptLoader.cs | 2 +-
TweetDuck.csproj | 8 +-------
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/Resources/PostBuild.ps1 b/Resources/PostBuild.ps1
index 00a07eaa..98c3a641 100644
--- a/Resources/PostBuild.ps1
+++ b/Resources/PostBuild.ps1
@@ -1,7 +1,8 @@
Param(
[Parameter(Mandatory = $True, Position = 1)][string] $targetDir,
[Parameter(Mandatory = $True, Position = 2)][string] $projectDir,
- [Parameter(Position = 3)][string] $version = ""
+ [Parameter(Position = 3)][string] $configuration = "Release",
+ [Parameter(Position = 4)][string] $version = ""
)
$ErrorActionPreference = "Stop"
@@ -37,6 +38,11 @@ try{
Copy-Item (Join-Path $projectDir "Resources\Scripts\*") -Destination (Join-Path $targetDir "scripts") -Recurse
Copy-Item (Join-Path $projectDir "Resources\Plugins\*") -Exclude ".debug", "emoji-instructions.txt" -Destination (Join-Path $targetDir "plugins\official") -Recurse
+ if ($configuration -eq "Debug"){
+ New-Item -ItemType directory -Path $targetDir -Name "plugins\user\.debug" | Out-Null
+ Copy-Item (Join-Path $projectDir "Resources\Plugins\.debug\*") -Destination (Join-Path $targetDir "plugins\user\.debug") -Recurse
+ }
+
# Helper functions
function Check-Carriage-Return{
diff --git a/Resources/ScriptLoader.cs b/Resources/ScriptLoader.cs
index 4393d722..fee9d590 100644
--- a/Resources/ScriptLoader.cs
+++ b/Resources/ScriptLoader.cs
@@ -106,7 +106,7 @@ public static void HotSwap(){
using(Process process = Process.Start(new ProcessStartInfo{
FileName = "powershell",
- Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"{Program.VersionTag}\"",
+ Arguments = $"-ExecutionPolicy Unrestricted -File \"{HotSwapRebuildScript}\" \"{HotSwapTargetDir}\\\" \"{HotSwapProjectRoot}\\\" \"Debug\" \"{Program.VersionTag}\"",
WindowStyle = ProcessWindowStyle.Hidden
})){
// ReSharper disable once PossibleNullReferenceException
diff --git a/TweetDuck.csproj b/TweetDuck.csproj
index 9305dab0..062e820f 100644
--- a/TweetDuck.csproj
+++ b/TweetDuck.csproj
@@ -413,13 +413,7 @@ rmdir "$(ProjectDir)bin\Release"
rmdir "$(TargetDir)scripts" /S /Q
rmdir "$(TargetDir)plugins" /S /Q
-powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\" "$(ProjectDir)\"
-
-if $(ConfigurationName) == Debug (
- rmdir "$(TargetDir)plugins\official\.debug" /S /Q
- mkdir "$(TargetDir)plugins\user\.debug"
- xcopy "$(ProjectDir)Resources\Plugins\.debug\*" "$(TargetDir)plugins\user\.debug\" /E /Y
-)
+powershell -ExecutionPolicy Unrestricted -File "$(ProjectDir)Resources\PostBuild.ps1" "$(TargetDir)\" "$(ProjectDir)\" "$(ConfigurationName)"
</PostBuildEvent>
</PropertyGroup>
<Target Name="AfterBuild" Condition="$(ConfigurationName) == Release">