From 32a29980d8ac7f141d98d5b05108619ec63e91f0 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Mon, 8 Jan 2018 17:02:16 -0800
Subject: [PATCH] Update config to pull runtime store from the public CLI feed

---
 build/SharedFx.props | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/SharedFx.props b/build/SharedFx.props
index edabfea8c3..8064f978a7 100644
--- a/build/SharedFx.props
+++ b/build/SharedFx.props
@@ -26,13 +26,18 @@
     <DebConfigInFile>$(_PackagingDir)debian_config.json.in</DebConfigInFile>
 
     <PublicCoreFeedPrefix>https://dotnetcli.blob.core.windows.net/dotnet/</PublicCoreFeedPrefix>
+    
+    <!-- Previously released versions of the RS are included in 2.1.0-preview1 for compat. They should be removed by RTM once the "trampoline" feature is in. -->
+    <RuntimeStoreArchiveLinkPrefix>$(PublicCoreFeedPrefix)aspnetcore/store/2.0.3-125/</RuntimeStoreArchiveLinkPrefix>
+    <RuntimeStoreArchiveFilename>Build.RS</RuntimeStoreArchiveFilename>
+    
+    <!-- In an orchestrated build, this may be overriden to other Azure feeds. -->
     <DotNetAssetRootUrl Condition="'$(DotNetAssetRootUrl)'==''">$(PublicCoreFeedPrefix)</DotNetAssetRootUrl>
 
     <DotnetRuntimePackageName>dotnet-runtime</DotnetRuntimePackageName>
     <DotnetRuntimeInstallerPrefix>$(DotnetRuntimePackageName)-$(MicrosoftNETCoreApp21PackageVersion)</DotnetRuntimeInstallerPrefix>
     <RuntimeArchiveLinkPrefix>$(DotNetAssetRootUrl)Runtime/$(MicrosoftNETCoreApp21PackageVersion)/$(DotnetRuntimeInstallerPrefix)</RuntimeArchiveLinkPrefix>
-    <RuntimeStoreArchiveLinkPrefix>$(DotNetAssetRootUrl)aspnetcore/store/2.0.3-125/</RuntimeStoreArchiveLinkPrefix>
-    <RuntimeStoreArchiveFilename>Build.RS</RuntimeStoreArchiveFilename>
+
     <SharedFxIntermediateArchiveFilePrefix>$(_SharedFxSourceDir)$(SharedFxIntermediateArchiveBaseName)-$(PackageVersion)</SharedFxIntermediateArchiveFilePrefix>
 
     <!-- installer metadata -->