From ac7a8b6f990dcf7b3ff0add431b6ad9711e3df83 Mon Sep 17 00:00:00 2001 From: madargs Date: Mon, 13 Feb 2017 15:24:07 +0000 Subject: [PATCH] Issue #181 - WinSW.NET2.exe - ILMerge should explicitly define v2 as a TargetPlatformVersion (#188) * Fixes #95 - Service not sending SIGINT properly to java Detach from console process after sending SIGINT to java. Note: we still need to be set to true, so the parent (java) process is shut down first. Moved exception handling to GetChildPids. StopProcessAndChildren now gets a fresh list of childPids after stopping a parent process, as that may have caused some child processes to terminate. * Fixes #181 - V2 : WinSW.NET2.exe not working Latest version of ILMerge targets .NET4 by default when merging assemblies; specify target platform version for the .NET2 executable. * Revert "Fixes #95 - Service not sending SIGINT properly to java" This reverts commit dc42c73fab53f96f25ea3543a8866283b7de2c59. --- src/Core/ServiceWrapper/winsw.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Core/ServiceWrapper/winsw.csproj b/src/Core/ServiceWrapper/winsw.csproj index f2c8f35..179beef 100644 --- a/src/Core/ServiceWrapper/winsw.csproj +++ b/src/Core/ServiceWrapper/winsw.csproj @@ -172,7 +172,7 @@ - + \ No newline at end of file