diff options
| author | Chris Sienkiewicz <chsienki@microsoft.com> | 2018-08-03 10:11:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-03 10:11:32 -0700 |
| commit | 101baee1010eaad47cd7afd1e041a7f422aefa78 (patch) | |
| tree | 3257365fa66dabb5e71d0dca0d88773841c7f405 /build-test.cmd | |
| parent | 1ef1f2a27c2e79ce0eaab59a6cefe84d8a79fc95 (diff) | |
| download | coreclr-101baee1010eaad47cd7afd1e041a7f422aefa78.tar.gz coreclr-101baee1010eaad47cd7afd1e041a7f422aefa78.tar.bz2 coreclr-101baee1010eaad47cd7afd1e041a7f422aefa78.zip | |
Build managed tests with dotnet (#19254)
* Change managed projects to build with dotnet msbuild, rather than desktop msbuild
* Build sdk tests as AnyCPU
* Correct args passed through to dotnet for tests
* Remove extra backslash from baseIntermediateOutputPath that was causing individual test exe builds to fail
* Fix double import warning for sdk projects
* Add default params from config.json to build-test dotnet invocations
* Fix priority argument passing from the command line for tests
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/build-test.cmd b/build-test.cmd index 38c97b59d0..b278996676 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -104,7 +104,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:priority=%__Priority%" +) if defined __BuildAgainstPackagesArg ( if not defined __RuntimeID ( @@ -117,7 +120,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 repo test build @@ -299,7 +302,7 @@ for /l %%G in (1, 1, %__BuildLoopCount%) do ( set __msbuildErr=/flp2:ErrorsOnly;LogFile="%__BuildErr%";Append=!__AppendToLog! set TestBuildSlice=%%G - call "%__ProjectDir%\run.cmd" build -Project=%__ProjectDir%\tests\build.proj -MsBuildLog=!__msbuildLog! -MsBuildWrn=!__msbuildWrn! -MsBuildErr=!__msbuildErr! %__RunArgs% %__BuildAgainstPackagesArg% %__PriorityArg% %__PassThroughArg% %__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: |