diff options
| author | Viktor Hofer <viktor.hofer@microsoft.com> | 2019-11-15 03:50:43 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 03:50:43 +0300 |
| commit | d8f6d63e347bca8e5056de66110ddd38474d9ae1 (patch) | |
| tree | 43c18297bce02388249001f974bd97ddc29cfec9 /src/coreclr/Directory.Build.props | |
| parent | 6c0cdd82ed0566f77abd4fcd95b80886efce9779 (diff) | |
Remove IsRuntimeRepository checks (#43)
* Remove IsRuntimeRepository checks
* Remove YAML bits needed for building in core-setup.
* Remove remaining consolidation branches in yml
Diffstat (limited to 'src/coreclr/Directory.Build.props')
| -rw-r--r-- | src/coreclr/Directory.Build.props | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/coreclr/Directory.Build.props b/src/coreclr/Directory.Build.props index f0d09d6b329..2e05f56574b 100644 --- a/src/coreclr/Directory.Build.props +++ b/src/coreclr/Directory.Build.props @@ -1,11 +1,9 @@ <Project> - <!-- TODO: Consolidate when moved to runtime repository: dotnet/corefx#42170 --> <PropertyGroup> - <IsRuntimeRepository Condition="Exists('$(MSBuildThisFileDirectory)..\..\.dotnet-runtime-placeholder')">true</IsRuntimeRepository> <SkipImportArcadeSdkFromRoot>true</SkipImportArcadeSdkFromRoot> </PropertyGroup> - <Import Project="..\..\Directory.Build.props" Condition="'$(IsRuntimeRepository)' == 'true'" /> + <Import Project="..\..\Directory.Build.props" /> <!-- Ensure our properties are set before Arcade defines defaults --> <Import Project="dir.common.props" /> |