From 5b0af04b29a185e34c224f2035f2b178f390479b Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Wed, 28 Mar 2018 13:03:52 -0700
Subject: [PATCH] Fix RPM generation when store folder is empty, and add
 restore source for dotnetfeed

---
 build/RuntimeStoreInstaller.targets | 4 +++-
 build/sources.props                 | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/build/RuntimeStoreInstaller.targets b/build/RuntimeStoreInstaller.targets
index 958975810d..420df124e7 100644
--- a/build/RuntimeStoreInstaller.targets
+++ b/build/RuntimeStoreInstaller.targets
@@ -223,7 +223,9 @@
 
     <!-- Create layout: Extract archive if given -->
     <MakeDir Directories="$(_WorkRoot)package_root\" />
-    <Exec Command="tar -xzf $(RSArchive) -C $(_WorkRoot)package_root\" Condition="'$(RSArchive)'!=''" />
+    <Exec Command="tar -xzf $(RSArchive) -C $(_WorkRoot)package_root\" Condition="'$(RSArchive)'!=''" StandardOutputImportance="Normal"  />
+    <!-- Ensure expected directories exist in the event we don't have additional files for this patch. -->
+    <MakeDir Directories="$(_WorkRoot)package_root\store;$(_WorkRoot)package_root\additionalDeps" />
 
     <!-- Create layout: Place changelog -->
     <Copy
diff --git a/build/sources.props b/build/sources.props
index 84cd4aabcb..fdcacd595e 100644
--- a/build/sources.props
+++ b/build/sources.props
@@ -10,6 +10,7 @@
     </RestoreSources>
     <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' ">
       $(RestoreSources);
+      https://dotnetfeed.blob.core.windows.net/dotnet-core/index.json;
       https://api.nuget.org/v3/index.json;
     </RestoreSources>
     <RestoreSources Condition=" '$(DotNetBuildOffline)' != 'true' AND '$(DisableMyGetRestoreSources)' != 'true' ">