File tree Expand file tree Collapse file tree 1 file changed +3
-4
lines changed
Expand file tree Collapse file tree 1 file changed +3
-4
lines changed Original file line number Diff line number Diff line change 6666 $major=$match.groups[1].value -as [int]
6767 $minor=$match.groups[2].value -as [int]
6868 $patch=$match.groups[3].value -as [int]
69- return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$major.$minor.$patch.$env:GITHUB_RUN_NUMBER"")]"
69+ return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$major.$minor.$patch.$env:GITHUB_RUN_NUMBER"")]".TrimEnd("]") # remove trailing ]
7070 }
7171 }
7272 }
8282 $tag=$match.groups[5].value
8383
8484 $branch = if ($env:GITHUB_HEAD_REF) { $env:GITHUB_HEAD_REF } else { $env:GITHUB_REF_NAME }
85-
8685 if ($branch -eq "master" -or $branch -eq "main") {
8786 if ($tag) { $version = "$major.$minor.$patch-$tag-r$env:GITHUB_RUN_NUMBER" }
8887 else { $version = "$major.$minor.$patch-r$env:GITHUB_RUN_NUMBER" }
9190 }
9291
9392 "version=$version" >> $env:GITHUB_OUTPUT
94- return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$version"")]"
93+ return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$version"")]".TrimEnd("]")
9594 }
9695 }
9796 }
@@ -101,7 +100,7 @@ jobs:
101100 foreach($content in $fileContent) {
102101 $match = [System.Text.RegularExpressions.Regex]::Match($content, $RegularExpression)
103102 if ($match.Success) {
104- return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$replaceWith"")]"
103+ return $fileContent -replace "^[^/]*\[assembly:\s*$name\(\""[^""]*\""\)", "[assembly: $name(""$replaceWith"")]".TrimEnd("]")
105104 }
106105 }
107106 }
You can’t perform that action at this time.
0 commit comments