From 6d9130dc61e00a4f6b4eadb2e7ecb3b54dd001bd Mon Sep 17 00:00:00 2001
From: jbeisner <jbeisner@microsoft.com>
Date: Sat, 13 Jan 2018 00:07:01 +0000
Subject: [PATCH] Simplify the 'index.json' removal.

---
 build/publish/AzureInfo.targets | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/build/publish/AzureInfo.targets b/build/publish/AzureInfo.targets
index 50a52e317..3e4600ee5 100644
--- a/build/publish/AzureInfo.targets
+++ b/build/publish/AzureInfo.targets
@@ -8,20 +8,13 @@
       <Output TaskParameter="BlobElements" ItemName="BlobElements" />
     </ParseBlobUrl>
 
-    <PropertyGroup>
-      <PublishBlobFeedUrlBlobPath>%(BlobElements.BlobPath)</PublishBlobFeedUrlBlobPath>
-    </PropertyGroup>
-
-    <RegexReplace Input="$(PublishBlobFeedUrlBlobPath)" Expression="index.json" Replacement="" Count="1">
-      <Output TaskParameter="Output" ItemName="BlobPath" />
-    </RegexReplace>
-
     <PropertyGroup>
       <ArtifactContainerName>%(BlobElements.ContainerName)</ArtifactContainerName>
       <ChecksumContainerName>%(BlobElements.ContainerName)</ChecksumContainerName>
       <ArtifactCloudDropAccountName>%(BlobElements.AccountName)</ArtifactCloudDropAccountName>
       <ChecksumCloudDropAccountName>%(BlobElements.AccountName)</ChecksumCloudDropAccountName>
-      <BlobStoragePartialRelativePath>%(BlobPath)assets</BlobStoragePartialRelativePath>
+      <PublishBlobFeedUrlBlobPath>%(BlobElements.BlobPath)</PublishBlobFeedUrlBlobPath>
+      <BlobStoragePartialRelativePath>$(PublishBlobFeedUrlBlobPath.Replace('/index.json', ''))/assets</BlobStoragePartialRelativePath>
     </PropertyGroup>
   </Target>