From b43acf4752a7841ee8b8e6be76dd51ec67f79761 Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Thu, 27 Apr 2017 16:09:51 -0700
Subject: [PATCH] Updated ASP .NET Core Runtime blob storage configuration.

---
 build/BundledRuntimes.props    | 18 +++++++++++-------
 build/DependencyVersions.props |  4 ++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 707d709f2..7c7df1543 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -13,12 +13,6 @@
     <DownloadedSharedFrameworkInstallerFileName Condition=" '$(InstallerExtension)' != '' ">dotnet-sharedframework-$(ProductMonikerRid).$(SharedFrameworkVersion)$(InstallerPortableSuffix)$(InstallerExtension)</DownloadedSharedFrameworkInstallerFileName>
     <DownloadedSharedFrameworkInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(DownloadedSharedFrameworkInstallerFileName)</DownloadedSharedFrameworkInstallerFile>
 
-    <!-- Examples:    Build.RuntimeStore.linux-preview1-24648.zip    AspNetCorePackageStoreLibx64.wixlib   -->
-    <ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' ">Build.RuntimeStore.$(OSName)-$(ASPNETCoreRuntimeFileNameVersionToken).zip</ASPNETCoreRuntimeInstallerFileName>
-	<ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' And '$(OSName)' == 'win' ">AspNetCorePackageStoreLib$(Architecture).wixlib</ASPNETCoreRuntimeInstallerFileName>
-
-    <ASPNETCoreRuntimeInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(PackagesDirectory)/$(ASPNETCoreRuntimeInstallerFileName)</ASPNETCoreRuntimeInstallerFile>
-
     <!-- Use the portable linux-x64 Rid when downloading the shared framework compressed file.
          NOTE: There isn't a 'linux-x64' version of the installers or the additional shared framweork. -->
     <SharedFrameworkRid>$(ProductMonikerRid)</SharedFrameworkRid>
@@ -34,7 +28,17 @@
     <CoreSetupInstallerBlobRootUrl>$(CoreSetupBlobRootUrlWithChannel)/Installers</CoreSetupInstallerBlobRootUrl>
     <CoreSetupDownloadDirectory>$(IntermediateDirectory)/coreSetupDownload/$(SharedFrameworkVersion)</CoreSetupDownloadDirectory>
     <CombinedSharedHostAndFrameworkArchive>$(CoreSetupDownloadDirectory)/combinedSharedHostAndFrameworkArchive</CombinedSharedHostAndFrameworkArchive>
+  </PropertyGroup>
+
+  <PropertyGroup>
     <ASPNETCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store</ASPNETCoreRuntimeInstallerBlobRootUrl>
+    <ASPNETCoreRuntimeDownloadDirectory>$(IntermediateDirectory)/ASPNETCoreRuntimeDownload</ASPNETCoreRuntimeDownloadDirectory>
+
+    <!-- Examples:    Build.RS.linux-preview1.zip    AspNetCorePackageStoreLibx64.wixlib   -->
+    <ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' ">Build.RS.$(OSName)-$(ASPNETCoreRuntimeFileNameVersionToken).zip</ASPNETCoreRuntimeInstallerFileName>
+    <ASPNETCoreRuntimeInstallerFileName Condition=" '$(InstallerExtension)' != '' And '$(OSName)' == 'win' ">AspNetCorePackageStoreLib$(Architecture).wixlib</ASPNETCoreRuntimeInstallerFileName>
+
+    <ASPNETCoreRuntimeInstallerFile Condition=" '$(InstallerExtension)' != '' ">$(ASPNETCoreRuntimeDownloadDirectory)/$(ASPNETCoreRuntimeInstallerFileName)</ASPNETCoreRuntimeInstallerFile>
   </PropertyGroup>
 
   <ItemGroup>
@@ -66,7 +70,7 @@
       <ExtractDestintation></ExtractDestintation>
     </_DownloadAndExtractItem>
 
-	<_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerFile"
+    <_DownloadAndExtractItem Include="ASPNETCoreRuntimeInstallerFile"
                              Condition="'$(SkipBuildingInstallers)' != 'true' And !Exists('$(ASPNETCoreRuntimeInstallerFile)') And '$(InstallerExtension)' != ''">
       <Url>$(ASPNETCoreRuntimeInstallerBlobRootUrl)/$(ASPNETCoreRuntimeVersion)/$(ASPNETCoreRuntimeInstallerFileName)</Url>
       <DownloadFileName>$(ASPNETCoreRuntimeInstallerFile)</DownloadFileName>
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index ec4d8c342..a3783839d 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -17,8 +17,8 @@
     <PlatformAbstractionsVersion>2.0.0-preview1-002101</PlatformAbstractionsVersion>
     <DependencyModelVersion>2.0.0-preview1-002101</DependencyModelVersion>
     <CliCommandLineParserVersion>0.1.0-alpha-142</CliCommandLineParserVersion>
-    <ASPNETCoreRuntimeVersion>2.0.11626.0-TEST</ASPNETCoreRuntimeVersion>
-    <ASPNETCoreRuntimeFileNameVersionToken>preview1-24648</ASPNETCoreRuntimeFileNameVersionToken>
+    <ASPNETCoreRuntimeVersion>2.0.0-preview1-30</ASPNETCoreRuntimeVersion>
+    <ASPNETCoreRuntimeFileNameVersionToken>preview1</ASPNETCoreRuntimeFileNameVersionToken>
 
   </PropertyGroup>