Was too aggressive with changes to PackageOutputPath property.

  - This represents this repo's generated packages rather than
    packages it consumes.

diff --git a/dir.common.props b/dir.common.props
index 11313be..4e2a3bb 100644 (file)
--- a/dir.common.props
+++ b/dir.common.props
@@ -7,9 +7,6 @@
   <PropertyGroup>
     <CoreclrDir>$(MSBuildThisFileDirectory)</CoreclrDir>
     <PackagesDir>$(CoreclrDir)/.packages/</PackagesDir>
-
-    <!-- [ARCADE_REMOVE] This property can be removed after build-tools is removed. -->
-    <PackageOutputPath>$(PackagesDir)</PackageOutputPath>
   </PropertyGroup>
 
   <!-- Define NuGet properties for scenarios where they aren't set. From the command line.

diff --git a/dir.props b/dir.props
index 51bb050..0b074ec 100644 (file)
--- 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 -->