summaryrefslogtreecommitdiff
path: root/dir.props
diff options
context:
space:
mode:
authorAaron Robinson <arobins@microsoft.com>2019-05-13 23:41:59 (GMT)
committerAaron Robinson <arobins@microsoft.com>2019-05-13 23:48:25 (GMT)
commita18ad94e54d5d03471db11e03fcb9a8d40b45c07 (patch)
tree4ef5e0d3537bc351daf9b74dc905457b2a99e015 /dir.props
parentabdfc4a2cfca256f464e7f950beb59e91c88a8bb (diff)
downloadcoreclr-a18ad94e54d5d03471db11e03fcb9a8d40b45c07.zip
coreclr-a18ad94e54d5d03471db11e03fcb9a8d40b45c07.tar.gz
coreclr-a18ad94e54d5d03471db11e03fcb9a8d40b45c07.tar.bz2
Was too aggressive with changes to PackageOutputPath property.
- This represents this repo's generated packages rather than packages it consumes.
Diffstat (limited to 'dir.props')
-rw-r--r--dir.props5
1 files changed, 3 insertions, 2 deletions
diff --git a/dir.props b/dir.props
index 51bb050..0b074ec 100644
--- a/dir.props
+++ b/dir.props
@@ -152,8 +152,9 @@
<CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm' and '$(TargetsWindows)' == 'true'">x86</CrossTargetComponentFolder>
<CrossTargetComponentFolder Condition="'$(PackagePlatform)' == 'arm' and '$(TargetsLinux)' == 'true'">x64</CrossTargetComponentFolder>
- <PackageOutputPath Condition="'$(PackageOutputPath)' == ''">$(PackagesBinDir)/pkg/</PackageOutputPath>
- <SymbolPackageOutputPath Condition="'$(SymbolPackageOutputPath)' == ''">$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath>
+ <!-- Created package output locations must be kept in sync with eng/build-job.yml -->
+ <PackageOutputPath>$(PackagesBinDir)/pkg/</PackageOutputPath>
+ <SymbolPackageOutputPath>$(PackagesBinDir)/symbolpkg/</SymbolPackageOutputPath>
<PackageIndexFile>$(MSBuildThisFileDirectory)/src/.nuget/packageIndex.json</PackageIndexFile>
<!-- coreclr doesn't currently use the index so don't force it to be in sync -->