From dcce9ce34c131e00415d50d36818238c2144d9e0 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Thu, 13 Jul 2017 12:04:04 -0700
Subject: [PATCH] Rename aspnet core store relate prop

According to email
The URL will be something like:

https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/$(Branch)-$(TimeStamp)/aspnetcore-store-$(AspNetVersion)-$(Release)-$(TimeStamp)-$(RID).deb

For example, if we are doing a build in the dev branch today, the URL
might look like this

https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/dev-12345/aspnetcore-store-2.0.0-rtm-12345-debian-x64.deb

But the same build from our 2.0.0 branch would be

https://dotnetcli.blob.core.windows.net/dotnet/aspnetcore/store/2.0.0-12345/aspnetcore-store-2.0.0-rtm-12345-debian-x64.deb

For 2.0 the branches we had were dev, 2.0.0-preview1, 2.0.0-preview2 and
2.0.0 (for RTM without any release moniker)
---
 build/BundledRuntimes.props    | 4 ++--
 build/DependencyVersions.props | 9 +++++++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/build/BundledRuntimes.props b/build/BundledRuntimes.props
index 1e5738a71..6d8f76c46 100644
--- a/build/BundledRuntimes.props
+++ b/build/BundledRuntimes.props
@@ -31,7 +31,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <AspNetCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeVersion)-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimeInstallerBlobRootUrl>
+    <AspNetCoreRuntimeInstallerBlobRootUrl>$(CoreSetupBlobRootUrl)aspnetcore/store/$(AspNetCoreRuntimeAzureblobStoresSubfolderName)</AspNetCoreRuntimeInstallerBlobRootUrl>
     <AspNetCoreSharedRuntimeVersionFileName>runtime.version</AspNetCoreSharedRuntimeVersionFileName>
     <AspNetCoreSharedRuntimeVersionFile Condition=" '$(AspNetCoreSharedRuntimeVersionFileName)' != '' ">$(PackagesDirectory)/$(AspNetCoreSharedRuntimeVersionFileName)</AspNetCoreSharedRuntimeVersionFile>
     
@@ -41,7 +41,7 @@
     <AspNetCoreRuntimeInstallerArchiveFileNameOSToken Condition=" '$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)' == '' ">linux</AspNetCoreRuntimeInstallerArchiveFileNameOSToken>
 
     <AspNetCoreRuntimeStoreSuffix Condition="'$(AspNetCoreRuntimePackageFlavor)' != 'notimestamp'">-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimeStoreSuffix>
-    <AspNetCoreRuntimeInstallerArchiveSuffix Condition="'$(AspNetCoreRuntimeStoreSuffix)' != ''">-$(AspNetCoherenceLabel)$(AspNetCoreRuntimeStoreSuffix)</AspNetCoreRuntimeInstallerArchiveSuffix>
+    <AspNetCoreRuntimeInstallerArchiveSuffix Condition="'$(AspNetCoreRuntimeStoreSuffix)' != ''">-$(AspNetCoreRelease)$(AspNetCoreRuntimeStoreSuffix)</AspNetCoreRuntimeInstallerArchiveSuffix>
     <AspNetCoreRuntimeInstallerArchiveFileName>Build.RS.$(AspNetCoreRuntimeInstallerArchiveFileNameOSToken)$(AspNetCoreRuntimeInstallerArchiveSuffix)$(ArchiveExtension)</AspNetCoreRuntimeInstallerArchiveFileName>
     <AspNetCoreRuntimeInstallerArchiveFile>$(PackagesDirectory)/$(AspNetCoreRuntimeInstallerArchiveFileName)</AspNetCoreRuntimeInstallerArchiveFile>
 
diff --git a/build/DependencyVersions.props b/build/DependencyVersions.props
index b2ca254e6..ff9b0ef81 100644
--- a/build/DependencyVersions.props
+++ b/build/DependencyVersions.props
@@ -35,10 +35,15 @@
 
     <!-- This should either be timestamped or notimestamp as appropriate -->
     <AspNetCoreRuntimePackageFlavor>timestamped</AspNetCoreRuntimePackageFlavor>
-    <AspNetCoreRuntimeVersion>2.0.0</AspNetCoreRuntimeVersion>
-    <AspNetCoherenceLabel>rtm</AspNetCoherenceLabel>
+    <!--BranchName and AspNetCoreVersion will not always be the same-->
+    <AspNetCoreBranchName>2.0.0</AspNetCoreBranchName>
+    <AspNetCoreRelease>rtm</AspNetCoreRelease>
+    <AspNetCoreVersion>2.0.0</AspNetCoreVersion>
     <AspNetCoreCoherenceTimestamp>26239</AspNetCoreCoherenceTimestamp>
 
+    <AspNetCoreRuntimePackageBrandName>aspnetcore-store</AspNetCoreRuntimePackageBrandName>
+    <AspNetCoreVersionAndRelease>$(AspNetCoreVersion)-$(AspNetCoreRelease)</AspNetCoreVersionAndRelease>
+    <AspNetCoreRuntimeAzureblobStoresSubfolderName>$(AspNetCoreBranchName)-$(AspNetCoreCoherenceTimestamp)</AspNetCoreRuntimeAzureblobStoresSubfolderName>
   </PropertyGroup>
 
   <!-- infrastructure and test only dependencies -->