Merge branch 'dev'

Author: mastersign

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.23.0.0")]
-[assembly: AssemblyFileVersion("0.23.0.0")]
+[assembly: AssemblyVersion("0.23.1.0")]
+[assembly: AssemblyFileVersion("0.23.1.0")]

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.23.0.0")]
-[assembly: AssemblyFileVersion("0.23.0.0")]
+[assembly: AssemblyVersion("0.23.1.0")]
+[assembly: AssemblyFileVersion("0.23.1.0")]

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.23.0.0")]
-[assembly: AssemblyFileVersion("0.23.0.0")]
+[assembly: AssemblyVersion("0.23.1.0")]
+[assembly: AssemblyFileVersion("0.23.1.0")]

BenchManager/BenchLib/PropertyCollections/GroupedVariableResolver.cs

@@ -22,7 +22,7 @@ namespace Mastersign.Bench.PropertyCollections
     /// </summary>
     public class GroupedVariableResolver : IValueResolver, IGroupedValueResolver
     {
-        private static readonly Regex DefaultGroupVariablePattern = new Regex("\\$(?<group>.*?):(?<name>.+?)\\$");
+        private static readonly Regex DefaultGroupVariablePattern = new Regex("\\$(?<group>[^:$]*?):(?<name>[^:$]+?)\\$");
 
         /// <summary>
         /// A regular expression, that detects variable references.

BenchManager/BenchLib/PropertyCollections/VariableResolver.cs

@@ -22,7 +22,7 @@ namespace Mastersign.Bench.PropertyCollections
     /// </summary>
     public class VariableResolver : IValueResolver, IGroupedValueResolver
     {
-        private static readonly Regex DefaultVariablePattern = new Regex("\\$(?<name>.+?)\\$");
+        private static readonly Regex DefaultVariablePattern = new Regex("\\$(?<name>[^:$]+?)\\$");
 
         /// <summary>
         /// A regular expression, that detects variable references.

CHANGELOG.md

@@ -25,6 +25,13 @@ Add a link to the GitHub diff like
 
 [Unreleased]: https://github.com/winbench/bench/compare/master...dev
 
+## [0.23.1] - 2024-04-17
+
+[0.23.1]: https://github.com/winbench/bench/compare/v0.23.0...v0.23.1
+
+### Fixed
+* Failing property value resolution in some edge cases
+
 ## [0.23.0] - 2024-04-12
 
 [0.23.0]: https://github.com/winbench/bench/compare/v0.22.6...v0.23.0

res/bench-install.bat

@@ -7,7 +7,7 @@ SetLocal
 :: https://winbench.org/guide/setup/
 ::
 
-SET VERSION=0.23.0
+SET VERSION=0.23.1
 SET TAG=v%VERSION%
 SET ROOT=%~dp0
 IF [%1] NEQ [] SET ROOT=%~dpnx1\

res/version.txt

@@ -1 +1 @@
-0.23.0
+0.23.1