diff options
| author | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-04-27 00:17:54 +0300 |
|---|---|---|
| committer | Wes Haggard <Wes.Haggard@microsoft.com> | 2017-04-28 05:08:23 +0300 |
| commit | cd39114da83c2e87cc2dc293f5e2e05aa9894a5b (patch) | |
| tree | 8fb27044c251c25fbda1eb757c8fe7ca047cbdce /dir.props | |
| parent | f65618f1b973cf057ae782f2d0402db185a72c14 (diff) | |
Move local corefx targets/tasks to BuildTools
This change mostly deals with moving Tools-Override and CoreFxTools
task library to BuildTools and consuming them from there instead.
Diffstat (limited to 'dir.props')
| -rw-r--r-- | dir.props | 11 |
1 files changed, 3 insertions, 8 deletions
@@ -36,16 +36,9 @@ <ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir> <ToolRuntimePath Condition="'$(ToolRuntimePath)'==''">$(ToolsDir)</ToolRuntimePath> <IlasmToolPath>$(ToolsDir)ilasm/ilasm</IlasmToolPath> - - <!-- needs to be defined all the time to avoid indexing every file from the root --> - <GeneratedProjectJsonDir>$(ObjDir)generated</GeneratedProjectJsonDir> - <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset> </PropertyGroup> - <!-- Temporarily enable local build of tools --> - <Import Project="$(SourceDir)Tools\corefxTools.props" /> - <Import Project="$(ToolRuntimePath)BuildVersion.targets" Condition="Exists('$(ToolRuntimePath)BuildVersion.targets')" /> <!-- Import Build tools common props file where repo-independent properties are found --> @@ -139,7 +132,9 @@ <!-- Initialize BuildConfiguration from the individual properties if it wasn't already explicitly set --> <BuildConfiguration Condition="'$(BuildConfiguration)' == ''">$(TargetGroup)-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</BuildConfiguration> - <BuildConfigurationImportFile>$(ToolsDir)/configuration/configuration.props</BuildConfigurationImportFile> + + <BuildConfigurationFolder>$(ToolsDir)configuration</BuildConfigurationFolder> + <BuildConfigurationImportFile>$(BuildConfigurationFolder)/configuration.props</BuildConfigurationImportFile> <!-- if PKGPROJ doesn't set BuildConfigurations, make sure it only builds for TargetGroup=package or BuildAllConfigurations --> <BuildConfigurations Condition="'$(MSBuildProjectExtension)' == '.pkgproj' AND '$(BuildConfigurations)' == ''">package</BuildConfigurations> |