diff options
| author | Matt Mitchell <mmitche@microsoft.com> | 2015-03-26 09:07:26 -0700 |
|---|---|---|
| committer | Matt Mitchell <mmitche@microsoft.com> | 2015-03-31 10:51:10 -0700 |
| commit | a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc (patch) | |
| tree | 0fd44f7b267796652151c6419b52f1139dc7d0f7 /tests/src | |
| parent | 82440897d45e16d706e80dc96918d362339d0d95 (diff) | |
| download | coreclr-a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc.tar.gz coreclr-a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc.tar.bz2 coreclr-a7f62d7de9fe72c6b4a3ed8173eb22c358de82cc.zip | |
Change paths and os names to match corefx
* binaries is now bin, intermediates is now obj
* modifying unixmscorlib build to instead be linuxmscorlib + osxmscorlib.
* Change OS=Unix to OS=Linux/OS=OSX and modified properties to mimic corefx's TargetsUnix.
Diffstat (limited to 'tests/src')
| -rw-r--r-- | tests/src/dir.common.props | 6 | ||||
| -rw-r--r-- | tests/src/dir.targets | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/src/dir.common.props b/tests/src/dir.common.props index 359acdf207..0b2a873d84 100644 --- a/tests/src/dir.common.props +++ b/tests/src/dir.common.props @@ -29,12 +29,12 @@ <!-- Setup the default output and intermediate paths --> <PropertyGroup> - <BaseOutputPathWithConfig>$(ProjectDir)\..\binaries\tests\$(BuildOS).$(Platform).$(Configuration)\</BaseOutputPathWithConfig> + <BaseOutputPathWithConfig>$(ProjectDir)\..\bin\tests\$(BuildOS).$(Platform).$(Configuration)\</BaseOutputPathWithConfig> <BaseOutputPathWithConfig Condition="'$(__TestBinDir)' != ''">$(__TestBinDir)\</BaseOutputPathWithConfig> <BinDir>$(BaseOutputPathWithConfig)\..</BinDir> - <BaseIntermediateOutputPath>$(ProjectDir)\..\binaries\tests\intermediates\</BaseIntermediateOutputPath> + <BaseIntermediateOutputPath>$(ProjectDir)\..\bin\tests\obj\</BaseIntermediateOutputPath> <BaseIntermediateOutputPath Condition="'$(__ManagedTestIntermediatesDir)' != ''">$(__ManagedTestIntermediatesDir)\</BaseIntermediateOutputPath> - <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\intermediates\$(BuildOS).$(Platform).$(Configuration)\))</__NativeTestIntermediatesDir> + <__NativeTestIntermediatesDir Condition="'$(__NativeTestIntermediatesDir)' == ''">$([System.IO.Path]::GetFullPath($(BaseOutputPathWithConfig)..\obj\$(BuildOS).$(Platform).$(Configuration)\))</__NativeTestIntermediatesDir> <BuildProjectRelativeDir>$(MSBuildProjectName)\</BuildProjectRelativeDir> <BuildProjectRelativeDir Condition="'$(MSBuildProjectDirectory.Contains($(SourceDir)))'">$([System.String]::Copy('$(MSBuildProjectDirectory)').Replace($(SourceDir),''))</BuildProjectRelativeDir> <IntermediateOutputPath>$(BaseIntermediateOutputPath)$(BuildProjectRelativeDir)</IntermediateOutputPath> diff --git a/tests/src/dir.targets b/tests/src/dir.targets index cd45da5440..0c38331b7d 100644 --- a/tests/src/dir.targets +++ b/tests/src/dir.targets @@ -36,7 +36,7 @@ <ItemGroup> <PossibleTargetFrameworks Include="$(_TargetFrameworkDirectories)" /> <ReferencePath Condition="'$(LinkLocalMscorlib)' != 'true'" Include="%(PossibleTargetFrameworks.Identity)mscorlib.dll" /> - <ReferencePath Condition="'$(LinkLocalMscorlib)' == 'true'" Include="$(ProjectDir)\..\binaries\Product\$(BuildOS).$(BuildArch).$(BuildType)\mscorlib.dll" /> + <ReferencePath Condition="'$(LinkLocalMscorlib)' == 'true'" Include="$(ProjectDir)\..\bin\Product\$(BuildOS).$(BuildArch).$(BuildType)\mscorlib.dll" /> </ItemGroup> </Target> |