Merge branch 'dev'

winbench · Mar 29, 2019 · 5a6e9b0 · 5a6e9b0
2 parents f408736 + a1631bd
commit 5a6e9b0
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 14 deletions.
diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.0.0")]
-[assembly: AssemblyFileVersion("0.22.0.0")]
+[assembly: AssemblyVersion("0.22.1.0")]
+[assembly: AssemblyFileVersion("0.22.1.0")]
diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.0.0")]
-[assembly: AssemblyFileVersion("0.22.0.0")]
+[assembly: AssemblyVersion("0.22.1.0")]
+[assembly: AssemblyFileVersion("0.22.1.0")]
diff --git a/BenchManager/BenchLib/BenchTasks.cs b/BenchManager/BenchLib/BenchTasks.cs
@@ -534,24 +534,29 @@ private static Process StartProcess(BenchEnvironment env,
                 throw new FileNotFoundException("The executable could not be found.", exe);
             }
             var si = new ProcessStartInfo(exe, arguments);
-            si.UseShellExecute = false;
             si.WorkingDirectory = cwd;
             env.Load(si.EnvironmentVariables);
+            si.UseShellExecute = false;
             return Process.Start(si);
         }
 
         private static Process StartProcessViaShell(BenchEnvironment env,
-            string cwd, string exe, string arguments,
+            string cwd, string exe, string arguments, string label = null,
             ProcessWindowStyle windowStyle = ProcessWindowStyle.Normal)
         {
             if (!File.Exists(exe))
             {
                 throw new FileNotFoundException("The executable could not be found.", exe);
             }
-            var si = new ProcessStartInfo(exe, arguments);
-            si.UseShellExecute = true;
-            si.WindowStyle = windowStyle;
+            var args = $"/C START \"{label}\" /D \"{cwd}\"";
+            if (windowStyle == ProcessWindowStyle.Minimized) args += " /MIN";
+            args += $" \"{exe}\" {arguments}";
+            var si = new ProcessStartInfo("cmd.exe", args);
+            si.WindowStyle = ProcessWindowStyle.Hidden;
+            si.CreateNoWindow = true;
             si.WorkingDirectory = cwd;
+            env.Load(si.EnvironmentVariables);
+            si.UseShellExecute = false;
             return Process.Start(si);
         }
 
@@ -577,7 +582,7 @@ public static Process LaunchApp(BenchConfiguration config, BenchEnvironment env,
                 throw new ArgumentException("The launcher executable is not set.");
             }
             return StartProcessViaShell(env, cwd,
-                exe, CommandLine.SubstituteArgumentList(app.LauncherArguments, args),
+                exe, CommandLine.SubstituteArgumentList(app.LauncherArguments, args), app.Label,
                 isAdorned ? ProcessWindowStyle.Minimized : ProcessWindowStyle.Normal);
         }
 

diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.22.0.0")]
-[assembly: AssemblyFileVersion("0.22.0.0")]
+[assembly: AssemblyVersion("0.22.1.0")]
+[assembly: AssemblyFileVersion("0.22.1.0")]
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,6 +25,14 @@ Add a link to the GitHub diff like
 
 [Unreleased]: https://github.com/winbench/bench/compare/master...dev
 
+## [0.22.1] - 2019-03-29
+
+[0.22.1]: https://github.com/winbench/bench/compare/v0.22.0...v0.22.1
+
+### Fixed
+* App Launch from Bench Dashboard partially broken
+  ([#139](https://github.com/winbench/bench/issues/139))
+
 ## [0.22.0] - 2019-03-29
 
 [0.22.0]: https://github.com/winbench/bench/compare/v0.21.1...v0.22.0

diff --git a/res/bench-install.bat b/res/bench-install.bat
@@ -7,7 +7,7 @@ SetLocal
 :: https://winbench.org/guide/setup/
 ::
 
-SET VERSION=0.22.0
+SET VERSION=0.22.1
 SET TAG=v%VERSION%
 SET ROOT=%~dp0
 IF [%1] NEQ [] SET ROOT=%~dpnx1\

diff --git a/res/version.txt b/res/version.txt
@@ -1 +1 @@
-0.22.0
+0.22.1