diff options
| author | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-01 22:27:56 -0700 |
|---|---|---|
| committer | Bruce Forstall <Bruce_Forstall@msn.com> | 2018-08-01 22:27:56 -0700 |
| commit | 18543e3e5ac3a9e960a7b0f30f697ddb505c3613 (patch) | |
| tree | 01c775b9d98cf58217aa5dc5883b90810c38b822 /tests/src/dir.props | |
| parent | 87e9259abda877c2fb80ff54dc85f782e3c64df0 (diff) | |
| download | coreclr-18543e3e5ac3a9e960a7b0f30f697ddb505c3613.tar.gz coreclr-18543e3e5ac3a9e960a7b0f30f697ddb505c3613.tar.bz2 coreclr-18543e3e5ac3a9e960a7b0f30f697ddb505c3613.zip | |
Revert "Build managed tests with dotnet (#19230)"
This reverts commit 763142a210d858289d30365dd1d4f2772e48f30d.
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 c5cc702882..2730073435 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" Condition="'$(UsingMicrosoftNETSdk)' != 'true'" /> + <Import Project="..\dir.common.props" /> <!-- 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> |