From aa458eca823fe3112a50b45acf2df81f529d9c12 Mon Sep 17 00:00:00 2001
From: jbeisner <jbeisner@microsoft.com>
Date: Fri, 12 Jan 2018 23:34:38 +0000
Subject: [PATCH] Strip off "index.json" before appending "assets"

---
 build/publish/AzureInfo.targets | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/build/publish/AzureInfo.targets b/build/publish/AzureInfo.targets
index 2d3229b36..50a52e317 100644
--- a/build/publish/AzureInfo.targets
+++ b/build/publish/AzureInfo.targets
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Condition="'$(GeneratePropsFile)' != 'true'"  Project="$(NuGetPackagesDir)/microsoft.dotnet.build.tasks.feed/$(BuildTasksFeedToolVersion)/build/Microsoft.DotNet.Build.Tasks.Feed.targets" />
-          
+   
   <Target Name="SetAzureProps"
           Condition=" '$(IsOrchestratedPublish)' == 'True' And '$(PB_PublishBlobFeedUrl)' != '' ">
 
@@ -9,12 +8,20 @@
       <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>%(BlobElements.BlobPath)/assets</BlobStoragePartialRelativePath>
+      <BlobStoragePartialRelativePath>%(BlobPath)assets</BlobStoragePartialRelativePath>
     </PropertyGroup>
   </Target>