Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corefx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWes Haggard <Wes.Haggard@microsoft.com>2016-09-24 01:55:25 +0300
committerWes Haggard <Wes.Haggard@microsoft.com>2016-09-24 01:55:25 +0300
commit086f535e1483a27f5a51a3a3c0260077fa03a8ca (patch)
tree8b4a3c9b3294376ff32e1fc4f9ea4aa12bbb7e19 /dir.props
parent5163b2fde5f9bc486ce083f6b900791f6eace6a1 (diff)
Always define GeneratedProjectJsonDir property
Fixes https://github.com/dotnet/corefx/issues/12001 Apparently msbuild will try to expand the wildcard item even if the condition on it is false and in some cases that causes GeneratedProjectJsonDir to be set to empty and causes msbuild to try to find all project.json files on the entire drive. To ensure we don't try indexing the entire drive we will always set the property. https://github.com/dotnet/corefx/commit/760104f2957978c475648923f744f0b709507559#diff-0b192804a6349e8c26d2b027afbd89a2R131
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props4
1 files changed, 3 insertions, 1 deletions
diff --git a/dir.props b/dir.props
index 27c41c5eb6..8b18c26bdf 100644
--- a/dir.props
+++ b/dir.props
@@ -48,6 +48,9 @@
<ToolsDir Condition="'$(UseToolRuntimeForToolsDir)'=='true'">$(ToolRuntimePath)</ToolsDir>
<ToolsDir Condition="'$(ToolsDir)'==''">$(ProjectDir)Tools/</ToolsDir>
<ToolRuntimePath Condition="'$(ToolRuntimePath)'==''">$(ToolsDir)</ToolRuntimePath>
+
+ <!-- needs to be defined all the time to avoid indexing every file from the root -->
+ <GeneratedProjectJsonDir>$(ObjDir)generated</GeneratedProjectJsonDir>
</PropertyGroup>
<Import Project="$(ToolRuntimePath)BuildVersion.targets" Condition="Exists('$(ToolRuntimePath)BuildVersion.targets')" />
@@ -93,7 +96,6 @@
<!-- This is the directory where we dynamically generate project.json's for our test build package dependencies -->
<PropertyGroup Condition="'$(BuildTestsAgainstPackages)' == 'true'">
- <GeneratedProjectJsonDir>$(ObjDir)generated</GeneratedProjectJsonDir>
<BuildTestsAgainstPackagesIdentityRegex>$(CoreFxVersionsIdentityRegex)</BuildTestsAgainstPackagesIdentityRegex>
<SkipVerifyPackageVersions>true</SkipVerifyPackageVersions>
</PropertyGroup>