From 0af7d1c187bf427984a7b18438914ff5c33124c5 Mon Sep 17 00:00:00 2001
From: Daniel Plaisted <daplaist@microsoft.com>
Date: Thu, 3 Jan 2019 14:58:20 -0800
Subject: [PATCH] Bundle runtime graph file in SDK

---
 src/redist/targets/GenerateBundledVersions.targets | 10 ++++++++++
 src/redist/targets/GenerateLayout.targets          |  1 +
 2 files changed, 11 insertions(+)

diff --git a/src/redist/targets/GenerateBundledVersions.targets b/src/redist/targets/GenerateBundledVersions.targets
index 8352ff8dd..c79da2a14 100644
--- a/src/redist/targets/GenerateBundledVersions.targets
+++ b/src/redist/targets/GenerateBundledVersions.targets
@@ -168,6 +168,7 @@ Copyright (c) .NET Foundation. All rights reserved.
     <BundledNETStandardTargetFrameworkVersion>$(_NETStandardTargetFrameworkVersion)</BundledNETStandardTargetFrameworkVersion>
     <BundledNETStandardPackageVersion>$(_NETStandardLibraryPackageVersion)</BundledNETStandardPackageVersion>
     <BundledNETCorePlatformsPackageVersion>$(_NETCorePlatformsPackageVersion)</BundledNETCorePlatformsPackageVersion>
+    <BundledRuntimeIdentifierGraphFile>%24(MSBuildThisFileDirectory)runtime.json</BundledRuntimeIdentifierGraphFile>
     @(BundledVersionsVariable->'<%(Identity)>%(Value)</%(Identity)>', '
     ')
     <NETCoreSdkVersion>$(SdkVersion)</NETCoreSdkVersion>
@@ -269,4 +270,13 @@ Copyright (c) .NET Foundation. All rights reserved.
                       Lines="$(BundledBundledCliToolsPropsContent)"
                       Overwrite="true" />
   </Target>
+
+  <Target Name="LayoutRuntimeGraph"
+          DependsOnTargets="GenerateBundledVersionsProps">
+
+    <Copy SourceFiles="$(NuGetPackageRoot)/microsoft.netcore.platforms/$(_NETCorePlatformsPackageVersion)/runtime.json"
+          DestinationFiles="$(SdkOutputDirectory)runtime.json" 
+          SkipUnchangedFiles="true"/> 
+    
+  </Target>
 </Project>
diff --git a/src/redist/targets/GenerateLayout.targets b/src/redist/targets/GenerateLayout.targets
index 86497b4e0..9bbc032c5 100644
--- a/src/redist/targets/GenerateLayout.targets
+++ b/src/redist/targets/GenerateLayout.targets
@@ -288,6 +288,7 @@
                             ExtractBundledComponents;
                             GenerateVersionFile;
                             GenerateBundledVersions;
+                            LayoutRuntimeGraph;
                             LayoutTemplates;
                             LayoutBundledTools;
                             RetargetTools;