diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2018-08-07 17:42:15 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-07 17:42:15 -0700 |
| commit | b4131b9f9dc9c73e47b315fff886db66374b1b21 (patch) | |
| tree | b87d3d632e05e01cc04aa4d7153e363585f284ad /build-test.cmd | |
| parent | c488296b594db3054e7cd2af2dab10428ccf0e42 (diff) | |
| download | coreclr-b4131b9f9dc9c73e47b315fff886db66374b1b21.tar.gz coreclr-b4131b9f9dc9c73e47b315fff886db66374b1b21.tar.bz2 coreclr-b4131b9f9dc9c73e47b315fff886db66374b1b21.zip | |
Use dotnet MSBuild for tests (#19324)
* Revert "Revert "Build managed tests with dotnet (#19254)""
* Reenable MSBuild support through dotnet instead of global MSBuild
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/build-test.cmd b/build-test.cmd index 242c39e70d..af9d182a54 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -107,7 +107,10 @@ if [!processedArgs!]==[] ( :ArgsDone @REM Special handling for -priority=N argument. -if %__Priority% GTR 0 (set "__PriorityArg=-priority=%__Priority%") +if %__Priority% GTR 0 ( + set "__PriorityArg=-priority=%__Priority%" + set "__PriorityMsbuildArg=/p:CLRTestPriorityToBuild=%__Priority%" +) if defined __BuildAgainstPackagesArg ( if not defined __RuntimeID ( @@ -120,7 +123,7 @@ if defined __BuildAgainstPackagesArg ( set __RunArgs=-BuildOS=%__BuildOS% -BuildType=%__BuildType% -BuildArch=%__BuildArch% REM As we move from buildtools to arcade, __RunArgs should be replaced with __msbuildArgs -set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% +set __msbuildArgs=/p:__BuildOS=%__BuildOS% /p:__BuildType=%__BuildType% /p:__BuildArch=%__BuildArch% /nologo /verbosity:minimal /clp:Summary echo %__MsgPrefix%Commencing CoreCLR test build @@ -317,10 +320,9 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( set __MsbuildLog=/flp:Verbosity=normal;LogFile="%__BuildLog%";Append=!__AppendToLog! set __MsbuildWrn=/flp1:WarningsOnly;LogFile="%__BuildWrn%";Append=!__AppendToLog! set __MsbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%";Append=!__AppendToLog! - set __Logging=-MsBuildLog=!__MsbuildLog! -MsBuildWrn=!__MsbuildWrn! -MsBuildErr=!__MsbuildErr! set TestBuildSlice=%%G - call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj !__Logging! %__RunArgs% %__BuildAgainstPackagesArg% %__PriorityArg% %__UnprocessedBuildArgs% + call %__DotnetHost% msbuild %__ProjectDir%\tests\build.proj !__MsbuildLog! !__MsbuildWrn! !__MsbuildErr! %__msbuildArgs% %__BuildAgainstPackagesMsbuildArg% !__PriorityMsbuildArg! %__PassThroughArg% %__UnprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: |