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 /tests/src/dir.props | |
| 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 'tests/src/dir.props')
| -rw-r--r-- | tests/src/dir.props | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/src/dir.props b/tests/src/dir.props index 2730073435..c5cc702882 100644 --- a/tests/src/dir.props +++ b/tests/src/dir.props @@ -1,7 +1,7 @@ <Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\dir.props" /> - <Import Project="..\dir.common.props" /> + <Import Project="..\dir.common.props" Condition="'$(UsingMicrosoftNETSdk)' != 'true'" /> <!-- Setup Default symbol and optimization for Configuration --> <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> @@ -37,7 +37,7 @@ <BaseOutputPath Condition="'$(__TestRootDir)' != ''">$(__TestRootDir)</BaseOutputPath> <BaseOutputPathWithConfig>$(BaseOutputPath)\$(OSPlatformConfig)\</BaseOutputPathWithConfig> <BinDir>$(BaseOutputPathWithConfig)</BinDir> - <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath> + <BaseIntermediateOutputPath>$(ProjectDir)..\bin\tests\obj\$(OSPlatformConfig)\Managed\</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath> <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\Native\))</__NativeTestIntermediatesDir> <BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir> |