diff options
| author | Aaron Robinson <arobins@microsoft.com> | 2019-05-06 10:19:49 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 10:19:49 -0700 |
| commit | 099177b0899156a4e8a352083a273805240c0ccd (patch) | |
| tree | 85c3f7c449ee3ed8b725c7212379914e7706e74f /dir.props | |
| parent | 7681c19e4a6f2b5a82abf6268e96eb9140f08bb7 (diff) | |
| download | coreclr-099177b0899156a4e8a352083a273805240c0ccd.tar.gz coreclr-099177b0899156a4e8a352083a273805240c0ccd.tar.bz2 coreclr-099177b0899156a4e8a352083a273805240c0ccd.zip | |
Port all managed product binaries to use SDK style projects (#24285)
Convert managed product binary to use SDK project system.
- Uses Arcade for versions strings
- Overrides Arcade defined output paths - should change in the future
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -61,10 +61,7 @@ <RootBinDir Condition="'$(__RootBinDir)'==''">$(ProjectDir)bin\</RootBinDir> <BinDir>$(__BinDir)\</BinDir> - <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(BuildOS).$(BuildArch).$(BuildType)\</BinDir> - - <__IntermediatesDir Condition="'$(__IntermediatesDir)' == ''">$(RootBinDir)obj\$(BuildOS).$(BuildArch).$(BuildType)</__IntermediatesDir> - <IntermediateOutputRootPath Condition="'$(IntermediateOutputRootPath)' == ''">$(__IntermediatesDir)\</IntermediateOutputRootPath> + <BinDir Condition="'$(__BinDir)'==''">$(RootBinDir)Product\$(PlatformConfigPathPart)\</BinDir> <!-- We don't append back slash because this path is used by nuget.exe as output directory and it fails to write packages to it if the path contains the forward slash. @@ -78,7 +75,7 @@ <BuildToolsSemaphore Condition="'$(BuildToolsSemaphore)' == ''">$(ToolsDir)Microsoft.DotNet.Build.Tasks.dll</BuildToolsSemaphore> <TestWorkingDir>$(__TestWorkingDir)\</TestWorkingDir> - <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(BuildOS).$(BuildArch).$(BuildType)\</TestWorkingDir> + <TestWorkingDir Condition="'$(__TestWorkingDir)'==''">$(RootBinDir)tests\$(PlatformConfigPathPart)\</TestWorkingDir> <Platform Condition="'$(Platform)' == ''">$(BuildArch)</Platform> <Platform Condition="'$(Platform)' == 'amd64'">x64</Platform> @@ -92,7 +89,11 @@ <!-- Output paths --> <PropertyGroup> <BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)' == ''">$(RootBinDir)obj\</BaseIntermediateOutputPath> - <IntermediateOutputPath Condition="'$(IntermediateOutputPath)' == ''">$(BaseIntermediateOutputPath)$(BuildOS).$(BuildArch).$(BuildType)\$(MSBuildProjectName)</IntermediateOutputPath> + + <AppendTargetFrameworkToOutputPath Condition="'$(ArcadeBuild)' == 'true'">false</AppendTargetFrameworkToOutputPath> + <IntermediateOutputPath>$(__IntermediatesDir)\$(MSBuildProjectName)\</IntermediateOutputPath> + <IntermediateOutputPath Condition="'$(__IntermediatesDir)' == ''">$(RootBinDir)obj/$(PlatformConfigPathPart)/$(MSBuildProjectName)/</IntermediateOutputPath> + <OutputPath Condition="'$(OutputPath)' == ''">$(BinDir)</OutputPath> </PropertyGroup> |