From: Davis Goodin <dagood@users.noreply.github.com>
Date: Tue, 19 Mar 2019 21:06:51 +0000 (-0500)
Subject: Move pkg tools import for runtime.json override (dotnet/core-setup#5512)
X-Git-Tag: submit/tizen/20210909.063632~11032^2~326
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9c947442248d80d0c8ccbf2befc223c9c4ca5128;p=platform%2Fupstream%2Fdotnet%2Fruntime.git

Move pkg tools import for runtime.json override (dotnet/core-setup#5512)

IncludeRuntimeJson was being overridden by dir.props, but the value in dir.props should have been overridden.

Commit migrated from https://github.com/dotnet/core-setup/commit/b0cfc6e820a94a1251e4fbb8cc2411ca351e3209
---

diff --git a/src/installer/pkg/projects/dir.props b/src/installer/pkg/projects/dir.props
index 5eadbd6..671e68d 100644
--- a/src/installer/pkg/projects/dir.props
+++ b/src/installer/pkg/projects/dir.props
@@ -20,8 +20,6 @@
     <PackProjectDependencies>true</PackProjectDependencies>
   </PropertyGroup>
 
-  <Import Project="packaging-tools\packaging-tools.props" />
-
   <!-- In *.builds projects, the current phase's name is the same as the project name. -->
   <PropertyGroup>
     <BuildPhase>$(MSBuildProjectName)</BuildPhase>
@@ -71,6 +69,8 @@
     </Otherwise>
   </Choose>
 
+  <Import Project="packaging-tools\packaging-tools.props" />
+
   <PropertyGroup Condition="'$(MSBuildProjectExtension)' == '.depproj'">
     <!-- we intentionally don't want to produce output -->
     <OutputPath>unused</OutputPath>