Skip to content

Commit b6b9118

Browse files
author
Bart Koelman
committed
fixup (force push 2)
1 parent 61d91ed commit b6b9118

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

Build.ps1

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,21 +41,13 @@ function RunCleanupCode {
4141
if ($env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT) {
4242
Write-Output "Running code cleanup on changed files in pull request"
4343

44-
$sourceCommitHash = $env:APPVEYOR_PULL_REQUEST_HEAD_COMMIT
44+
$mergeCommitHash = git rev-parse "HEAD"
4545
$targetCommitHash = git rev-parse "$env:APPVEYOR_REPO_BRANCH"
4646

47-
Write-Output "Source commit hash = $sourceCommitHash"
47+
Write-Output "Merge commit hash = $mergeCommitHash"
4848
Write-Output "Target commit hash = $targetCommitHash"
4949

50-
51-
$mergeCommitHash = git rev-parse "HEAD"
52-
Write-Output "mergeCommitHash = $mergeCommitHash"
53-
54-
$altMergeCommitHash = git rev-parse "$env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH"
55-
Write-Output "altMergeCommitHash = $altMergeCommitHash"
56-
57-
58-
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $sourceCommitHash -b $targetCommitHash --fail-on-diff --print-diff
50+
dotnet regitlint -s JsonApiDotNetCore.sln --print-command --jb --profile --jb --profile='\"JADNC Full Cleanup\"' --jb --properties:Configuration=Release --jb --verbosity=WARN -f commits -a $mergeCommitHash -b $targetCommitHash --fail-on-diff --print-diff
5951
CheckLastExitCode
6052
}
6153
}

src/JsonApiDotNetCore/ArrayFactory.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ public static T[] Create<T>(params T[] items)
1212
}
1313

1414

15+
1516

16-
17-
17+
1818

1919
}

0 commit comments

Comments
 (0)