diff options
| author | Chris Sienkiewicz <chsienki@microsoft.com> | 2018-08-01 16:13:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-01 16:13:39 -0700 |
| commit | 763142a210d858289d30365dd1d4f2772e48f30d (patch) | |
| tree | 32b0e101ab32f48bd81fa6063a9a9334b019c92d /build-test.cmd | |
| parent | fd4bd60a0b405126f0d7954861bbbc2504192bd4 (diff) | |
| download | coreclr-763142a210d858289d30365dd1d4f2772e48f30d.tar.gz coreclr-763142a210d858289d30365dd1d4f2772e48f30d.tar.bz2 coreclr-763142a210d858289d30365dd1d4f2772e48f30d.zip | |
Build managed tests with dotnet (#19230)
* 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
Diffstat (limited to 'build-test.cmd')
| -rw-r--r-- | build-test.cmd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build-test.cmd b/build-test.cmd index 17f67c1b8f..e956f04c18 100644 --- a/build-test.cmd +++ b/build-test.cmd @@ -118,7 +118,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 if defined __ToolsetDir ( rem arm64 builds currently use private toolset which has not been released yet @@ -321,7 +321,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% %__PriorityArg% %__PassThroughArg% %__unprocessedBuildArgs% if errorlevel 1 ( echo %__MsgPrefix%Error: build failed. Refer to the build log files for details: |