ci: Fix build, maybe.

Author: freezy

.github/workflows/build.yml

@@ -113,60 +113,70 @@ jobs:
         id: set_version
         shell: pwsh
         run: |
+          [int]$revVal = 0
+          $ok = [int]::TryParse($env:BRANCH_BUILD, [ref]$revVal)
+          if (-not $ok -or $revVal -le 0) {
+            $revVal = [int]$env:GITHUB_RUN_NUMBER
+          }
+          $env:BRANCH_BUILD = "$revVal"
           function replaceNumericVersion($name, $fileContent) {
-            $pattern = '^[^/]*\[assembly:\s*' + [regex]::Escape($name) + '\("(\d+)\.(\d+)\.(\d+)(\.(\d+))?"\)'
+            # allow multi-digit segments; match the whole attribute
+            $pattern = '^[^/]*\[assembly:\s*' + [regex]::Escape($name) + '\("(\d+)\.(\d+)\.(\d+)(?:\.(\d+))?"\)\s*$'
             $re = [regex]::new($pattern)
-            foreach ($content in $fileContent) {
-              $m = $re.Match($content)
+            foreach ($line in $fileContent) {
+              $m = $re.Match($line)
               if ($m.Success) {
                 $major = [int]$m.Groups[1].Value
                 $minor = [int]$m.Groups[2].Value
                 $patch = [int]$m.Groups[3].Value
-                return $fileContent -replace $pattern, "[assembly: $name(""$major.$minor.$patch.$env:BRANCH_BUILD"")]".TrimEnd("]")
+                $new  = "[assembly: $name(""$major.$minor.$patch.$($env:BRANCH_BUILD)"")]"
+                return $fileContent -replace $pattern, [System.Text.RegularExpressions.Regex]::Escape($new).Replace('\[','[').Replace('\]',']')
               }
             }
           }
 
           function replaceFullVersion($name, $fileContent) {
-            $pattern = '[^/]*\[assembly:\s*' + [regex]::Escape($name) + '\("(\d)\.(\d)\.(\d)(-([\w\W]+))?"\)'
+            # use \d+ (not just \d) and capture optional -tag
+            $pattern = '[^/]*\[assembly:\s*' + [regex]::Escape($name) + '\("(\d+)\.(\d+)\.(\d+)(?:-([\w\W]+))?"\)\s*$'
             $re = [regex]::new($pattern)
-            foreach ($content in $fileContent) {
-              $m = $re.Match($content)
+            foreach ($line in $fileContent) {
+              $m = $re.Match($line)
               if ($m.Success) {
                 $major = [int]$m.Groups[1].Value
                 $minor = [int]$m.Groups[2].Value
                 $patch = [int]$m.Groups[3].Value
-                $tag   = $m.Groups[5].Value
+                $tag   = $m.Groups[4].Value
+
                 $branch = if ($env:GITHUB_HEAD_REF) { $env:GITHUB_HEAD_REF } else { $env:GITHUB_REF_NAME }
                 if ($branch -eq "master" -or $branch -eq "main") {
-                  if ($tag) { $version = "$major.$minor.$patch-$tag-r$env:BRANCH_BUILD" }
-                  else { $version = "$major.$minor.$patch-r$env:BRANCH_BUILD" }
+                  $version = if ($tag) { "$major.$minor.$patch-$tag-r$($env:BRANCH_BUILD)" } else { "$major.$minor.$patch-r$($env:BRANCH_BUILD)" }
                 } else {
-                  $version = "$major.$minor.$patch-$($branch.ToUpper())-r$env:BRANCH_BUILD"
+                  $version = "$major.$minor.$patch-$($branch.ToUpper())-r$($env:BRANCH_BUILD)"
                 }
+
                 "version=$version" >> $env:GITHUB_OUTPUT
-                return $fileContent -replace $pattern, "[assembly: $name(""$version"")]".TrimEnd("]")
+                $new = "[assembly: $name(""$version"")]"
+                return $fileContent -replace $pattern, [System.Text.RegularExpressions.Regex]::Escape($new).Replace('\[','[').Replace('\]',']')
               }
             }
           }
 
           function replaceAny($name, $replaceWith, $fileContent) {
-            $pattern = '^[^/]*\[assembly:\s*' + [regex]::Escape($name) + '\("[^"]*"\)'
+            $pattern = '^[^/]*\[assembly:\s*' + [regex]::Escape($name) + '\("[^"]*"\)\s*$'
             $re = [regex]::new($pattern)
-            foreach ($content in $fileContent) {
-              $m = $re.Match($content)
-              if ($m.Success) {
-                return $fileContent -replace $pattern, "[assembly: $name(""$replaceWith"")]".TrimEnd("]")
+            foreach ($line in $fileContent) {
+              if ($re.IsMatch($line)) {
+                $new = "[assembly: $name(""$replaceWith"")]"
+                return $fileContent -replace $pattern, [System.Text.RegularExpressions.Regex]::Escape($new).Replace('\[','[').Replace('\]',']')
               }
             }
           }
-
           
           $assemblyFile = "VersionAssemblyInfo.cs"
-          $fileContent = Get-Content $assemblyFile
-          $fileContent = replaceNumericVersion 'AssemblyVersion' $fileContent
-          $fileContent = replaceNumericVersion 'AssemblyFileVersion' $fileContent
-          $fileContent = replaceFullVersion 'AssemblyInformationalVersion' $fileContent
+          $fileContent  = Get-Content $assemblyFile
+          $fileContent  = replaceNumericVersion 'AssemblyVersion' $fileContent
+          $fileContent  = replaceNumericVersion 'AssemblyFileVersion' $fileContent
+          $fileContent  = replaceFullVersion   'AssemblyInformationalVersion' $fileContent
           if (-not $env:GITHUB_REF.StartsWith("refs/tags/")) {
             $fileContent = replaceAny 'AssemblyConfiguration' $env:GITHUB_SHA.Substring(0, 7) $fileContent
           }