diff --git a/BenchManager/BenchCLI/Properties/AssemblyInfo.cs b/BenchManager/BenchCLI/Properties/AssemblyInfo.cs index 8de19186..b0a8d7c3 100644 --- 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.16.0.0")] -[assembly: AssemblyFileVersion("0.16.0.0")] +[assembly: AssemblyVersion("0.16.1.0")] +[assembly: AssemblyFileVersion("0.16.1.0")] diff --git a/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs b/BenchManager/BenchDashboard/Properties/AssemblyInfo.cs index 76cc143b..3346ca22 100644 --- 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.16.0.0")] -[assembly: AssemblyFileVersion("0.16.0.0")] +[assembly: AssemblyVersion("0.16.1.0")] +[assembly: AssemblyFileVersion("0.16.1.0")] diff --git a/BenchManager/BenchLib/BenchTasks.cs b/BenchManager/BenchLib/BenchTasks.cs index aa071fca..b999e463 100644 --- a/BenchManager/BenchLib/BenchTasks.cs +++ b/BenchManager/BenchLib/BenchTasks.cs @@ -948,6 +948,7 @@ private static ActionResult RunTasks(IBenchManager man, logger = new TaskInfoLogger(file, logLevel == LogLevels.Error); } + var notificationLock = new object(); var infos = new List(); var errorIds = new List(); var taskProgress = 0f; @@ -959,14 +960,17 @@ private static ActionResult RunTasks(IBenchManager man, { info = ((TaskProgress)info).ScaleProgress(taskProgress, 1f / tasks.Length); } - if (info is TaskError && info.AppId != null && !errorIds.Contains(info.AppId)) + lock (notificationLock) { - errorIds.Add(info.AppId); - } - infos.Add(info); - if (logger != null) - { - logger.Log(info); + if (info is TaskError && info.AppId != null && !errorIds.Contains(info.AppId)) + { + errorIds.Add(info.AppId); + } + infos.Add(info); + if (logger != null) + { + logger.Log(info); + } } notify(info); }; diff --git a/BenchManager/BenchLib/Properties/AssemblyInfo.cs b/BenchManager/BenchLib/Properties/AssemblyInfo.cs index 21ab3e0d..9481da95 100644 --- 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.16.0.0")] -[assembly: AssemblyFileVersion("0.16.0.0")] +[assembly: AssemblyVersion("0.16.1.0")] +[assembly: AssemblyFileVersion("0.16.1.0")] diff --git a/CHANGELOG.md b/CHANGELOG.md index d39d64fe..a41557d4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,6 +25,14 @@ Add a link to the GitHub diff like [Unreleased]: https://github.com/mastersign/bench/compare/master...dev +## [0.16.1] - 2017-05-17 + +[0.16.1]: https://github.com/mastersign/bench/compare/v0.16.0...v0.16.1 + +### Fixed +- Crash when downloading (race condition during notification processing) + ([#108](https://github.com/mastersign/bench/issues/108)) + ## [0.16.0] - 2017-05-16 [0.16.0]: https://github.com/mastersign/bench/compare/v0.15.2...v0.16.0 diff --git a/res/bench-install.bat b/res/bench-install.bat index 30a27998..8e24a4df 100644 --- a/res/bench-install.bat +++ b/res/bench-install.bat @@ -6,7 +6,7 @@ :: http://mastersign.github.io/bench/guide/setup/ :: -SET VERSION=0.16.0 +SET VERSION=0.16.1 SET ROOT=%~dp0 SET TAG=v%VERSION% SET BENCH_ZIPURL=https://github.com/mastersign/bench/releases/download/%TAG%/Bench.zip @@ -76,7 +76,7 @@ POPD ECHO.Deleting 'bench.zip' ... DEL "%BENCH_ZIPFILE%" -ECHO.Deleting 'bench-install.bat' and exiting ... +ECHO.Deleting '%BENCH_BOOTSTRAP_FILE%' and exiting ... ECHO.A copy can always be found in the 'res' folder. :: Trick to exit the script before deleting it (GOTO) 2>nul & DEL "%BENCH_BOOTSTRAP_FILE%" diff --git a/res/version.txt b/res/version.txt index d183d4ac..92e0c743 100644 --- a/res/version.txt +++ b/res/version.txt @@ -1 +1 @@ -0.16.0 \ No newline at end of file +0.16.1 \ No newline at end of file