Skip to content

Commit 53ffdaa

Browse files
dotnet-botladipro
andauthored
Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 5308962 (#6929)
* Localized file check-in by OneLocBuild Task: Build definition ID 9434: Build ID 5308962 * Fix EngineServices version bump check Co-authored-by: Ladi Prosek <laprosek@microsoft.com>
1 parent 639d6d7 commit 53ffdaa

File tree

14 files changed

+16
-17
lines changed

14 files changed

+16
-17
lines changed

eng/build.ps1

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -160,10 +160,9 @@ function Check-RequiredVersionBumps() {
160160
# Log VSTS errors for missing required version bumps
161161
$targetBranch = $env:SYSTEM_PULLREQUEST_TARGETBRANCH
162162
if ($targetBranch) {
163-
# Prepend remote reference if the branch is not local
164-
if (!$targetBranch.StartsWith("refs/heads/")) {
165-
$targetBranch = "refs/remotes/origin/" + $targetBranch
166-
}
163+
# Some PRs specify the bare target branch (most commonly "main"), some prefix it with "refs/heads/".
164+
# The following statement normalizes both to a revision spec that git understands.
165+
$targetBranch = "refs/remotes/origin/" + ($targetBranch -replace "^refs/heads/", "")
167166
$versionLineChanged = $false
168167
git --no-pager diff --unified --no-color --exit-code -w $targetBranch HEAD src\Framework\EngineServices.cs `
169168
| Select-String -Pattern "int Version =" | ForEach-Object -process { $versionLineChanged = $true }

src/MSBuild/Resources/xlf/Strings.cs.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.de.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.es.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.fr.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.it.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.ja.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.ko.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.pl.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/MSBuild/Resources/xlf/Strings.pt-BR.xlf

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)