using dotnet 4.0 client fw, 60s timeout kill

using different framework, so no config file is required to start with correct framework
SeidChr · Nov 17, 2018 · c647157 · c647157
1 parent 3e36635
commit c647157
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 15 deletions.
diff --git a/App.config b/App.config
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5.2" />
-    </startup>
-</configuration>
+
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.0,Profile=Client"/></startup>
+</configuration>
diff --git a/Program.cs b/Program.cs
@@ -1,7 +1,6 @@
 namespace PowerShellWindowHost
 {
     using System;
-    using System.ComponentModel;
     using System.Diagnostics;
     using System.IO;
     using System.Reflection;
@@ -14,10 +13,15 @@ public static int Main(string[] args)
             var executingAssembly = Assembly.GetExecutingAssembly();
 
             var fullName = Path.GetFileName(executingAssembly.Location);
-
+
+            SimpleLog.Prefix = $"{fullName}.";
+
+            SimpleLog.Info($"RunHiddenConsole Executing Assembly FullName: {fullName}");
+
             var match = Regex.Match(fullName, @"(.+)w(\.\w{1,3})");
             if (!match.Success)
             {
+                SimpleLog.Error("Unable to find target executable name in own executable name.");
                 return -7001;
             }
 
@@ -28,8 +32,8 @@ public static int Main(string[] args)
 
             var startInfo = new ProcessStartInfo
             {
-                CreateNoWindow = true,
-                UseShellExecute = false,
+                ////CreateNoWindow = true,
+                ////UseShellExecute = false,
                 WindowStyle = ProcessWindowStyle.Hidden,
                 WorkingDirectory = Directory.GetCurrentDirectory(),
                 Arguments = string.Join(" ", args),
@@ -41,20 +45,23 @@ public static int Main(string[] args)
                 var proc = Process.Start(startInfo);
                 if (proc == null)
                 {
+                    SimpleLog.Error("Unable to start the target process.");
                     return -7002;
                 }
 
-                proc.WaitForExit();
+                if (!proc.WaitForExit(60000))
+                {
+                    SimpleLog.Error("Process didn't close within 60s. Killing.");
+                    proc.Kill();
+                }
+
                 return proc.ExitCode;
             }
-            catch (Win32Exception)
+            catch (Exception ex)
             {
+                SimpleLog.Error("Starting target process threw an unknown Exception: " + ex);
                 return -7003;
             }
-            catch (SystemException)
-            {
-                return -7004;
-            }
         }
     }
 }
diff --git a/RunHiddenConsole.csproj b/RunHiddenConsole.csproj
@@ -8,10 +8,11 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>PowerShellWindowHost</RootNamespace>
     <AssemblyName>hiddenw</AssemblyName>
-    <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile>Client</TargetFrameworkProfile>
   </PropertyGroup>
   <PropertyGroup>
     <StartupObject>PowerShellWindowHost.Program</StartupObject>