diff options
| author | Michal Strehovský <michals@microsoft.com> | 2016-03-24 04:25:45 +0300 |
|---|---|---|
| committer | Michal Strehovský <michals@microsoft.com> | 2016-03-24 07:55:37 +0300 |
| commit | 061511e8f3da68b8d61dc5358a75b2092a61bacc (patch) | |
| tree | b6ceaef22abde709abb80a8bfaab99554acd89d3 /dir.props | |
| parent | a60fbe4fda085115185bbfb87a7c64125d8b0308 (diff) | |
Fix race condition when running tests
Fixes #974.
Changing the OutputPath also changed ProductPackageDir to something
weird, so I took this as an opportunity to stop placing packaging
related stuff into weird directories (".nuget" was a weird one too -
prefixing with a dot is how you hide directories on Unix).
runtest.sh was passing a dead parameter to restore.sh, so I fixed that
too. I didn't test on Unix. The CI will...
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -101,10 +101,10 @@ <OSPlatformConfig>$(BinDirOSGroup).$(BinDirPlatform).$(BinDirConfiguration)</OSPlatformConfig> <BaseOutputPath Condition="'$(BaseOutputPath)'==''">$(ProductBinDir)</BaseOutputPath> - <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)\</OutputPath> + <OutputPath Condition="'$(OutputPath)'==''">$(BaseOutputPath)$(OSPlatformConfig)/$(MSBuildProjectName)/</OutputPath> <!-- Folder where we will drop the Nuget package for the toolchain --> - <ProductPackageDir Condition="'$(ProductPackageDir)'==''">$(OutputPath).nuget/</ProductPackageDir> + <ProductPackageDir Condition="'$(ProductPackageDir)'==''">$(BaseOutputPath)$(OSPlatformConfig)/packaging/</ProductPackageDir> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'==''">$(ObjDir)</BaseIntermediateOutputPath> <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(BaseIntermediateOutputPath)$(OSPlatformConfig)\</IntermediateOutputRootPath> |