diff options
| -rw-r--r-- | build-packages.cmd | 5 | ||||
| -rwxr-xr-x | build-packages.sh | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/build-packages.cmd b/build-packages.cmd index 0c827b5a77..3297bfc214 100644 --- a/build-packages.cmd +++ b/build-packages.cmd @@ -37,10 +37,7 @@ if NOT [!ERRORLEVEL!]==[0] ( exit /b 1 ) -rem Build the TestHost package -set __msbuildArgs="%__ProjectDir%\src\.nuget\Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds" !allargs! -echo msbuild.exe %__msbuildArgs% !options! >> %packagesLog% -call msbuild.exe %__msbuildArgs% !options! +call %__ProjectDir%/run.cmd build-packages -Project=%__ProjectDir%\src\.nuget\Microsoft.NETCore.TestHost\Microsoft.NETCore.TestHost.builds -FilterToOSGroup=Windows_NT %allargs% if NOT [!ERRORLEVEL!]==[0] ( echo ERROR: An error occurred while building packages, see %packagesLog% for more details. exit /b 1 diff --git a/build-packages.sh b/build-packages.sh index ce27dd556e..5e03ac294b 100755 --- a/build-packages.sh +++ b/build-packages.sh @@ -62,11 +62,9 @@ then exit 1 fi - # Build the TestHost package - $__ProjectRoot/Tools/dotnetcli/dotnet "$__MSBuildPath" /nologo "$__ProjectRoot/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds" /verbosity:minimal "/fileloggerparameters:Verbosity=normal;LogFile=$binclashlog" /t:Build /p:__BuildOS=$__BuildOS /p:__BuildArch=$__BuildArch /p:__BuildType=$__BuildType /p:__IntermediatesDir=$__IntermediatesDir /p:BuildNugetPackage=false /p:UseSharedCompilation=false - +# Build the TestHost package +$__ProjectRoot/run.sh build-packages -Project=$__ProjectRoot/src/.nuget/Microsoft.NETCore.TestHost/Microsoft.NETCore.TestHost.builds -DistroRid=\${OSRid}-$__Arch -UseSharedCompilation=false -BuildNugetPackage=false $unprocessedBuildArgs if [ $? -ne 0 ]; then - echo -e "\nAn error occurred. Aborting build-packages.sh ." >> $build_packages_log echo "ERROR: An error occurred while building packages, see $build_packages_log for more details." exit 1 fi |