Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit d42cdd0

Browse files
author
Sergey Andreenko
authored
fix merge conflict in build-test.sh (#19744)
1 parent 398caa5 commit d42cdd0

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

build-test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ build_Tests()
292292
# Always create the test wrappers and set the exclude file.
293293
export __Exclude="$__TestDir/issues.targets"
294294
echo "Exclude set to $__TestDir/issues.targets"
295-
build_Tests_internal "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "Test Xunit Wrapper" "-BuildWrappers" "-MsBuildEventLogging= " "-TargetsWindows=false"
295+
build_MSBuild_projects "Tests_XunitWrapper" "$__ProjectDir/tests/runtest.proj" "Test Xunit Wrapper" "-BuildWrappers" "-MsBuildEventLogging= " "-TargetsWindows=false"
296296

297297
if [ $? -ne 0 ]; then
298298
echo "${__MsgPrefix}Error: build failed. Refer to the build log files for details (above)"

0 commit comments

Comments
 (0)