From 3bcf1deebbe3f1845483a1b05bfb4c5677b6bd18 Mon Sep 17 00:00:00 2001
From: Jose Perez Rodriguez <joperezr@microsoft.com>
Date: Fri, 12 May 2017 15:49:32 -0700
Subject: [PATCH] Fix Microsoft.NETCore.App package version file location for
 RID specific packages (dotnet/core-setup#2379)

Commit migrated from https://github.com/dotnet/core-setup/commit/bf90d5fba3fdd244adcd7100473cd00b90d74832
---
 .../Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
index 96fcb03..69f4d7e 100644
--- a/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
+++ b/src/installer/pkg/projects/Microsoft.NETCore.App/src/Microsoft.NETCore.App.depproj
@@ -129,12 +129,6 @@
                        Overwrite="true"/>
   </Target>
 
-  <ItemGroup>
-    <FilesToPackage Include="$(IntermediateOutputPath)\Microsoft.NETCore.App.versions.txt">
-      <TargetPath></TargetPath>
-    </FilesToPackage>
-  </ItemGroup>
-
   <!-- Fetches all the file items from the packages that we want to redist -->
   <Target Name="GetFilesFromPackages" DependsOnTargets="GetPackagePaths">
     <ItemGroup Condition="'$(NuGetRuntimeIdentifier)' != ''">
@@ -175,6 +169,13 @@
       <_sourcePath Include="@(_sourcePathCandidate)" Condition="Exists('%(Identity)')" />
     </ItemGroup>
 
+    <!-- Add versions file with the hashes of the repos we consume -->
+    <ItemGroup>
+      <FilesToPackage Include="$(IntermediateOutputPath)\Microsoft.NETCore.App.versions.txt">
+        <TargetPath></TargetPath>
+      </FilesToPackage>
+    </ItemGroup>
+
     <!-- on windows workaround max-path -->
     <!-- this can be removed once we build on core MSBuild which supports long paths. -->
     <ItemGroup Condition="'$(OsEnvironment)'=='Windows_NT'">
-- 
2.7.4