From 4048a2ca3df02c323d68242ddc9e655c49b5443b Mon Sep 17 00:00:00 2001
From: Matt Mitchell <mmitche@microsoft.com>
Date: Thu, 24 Jan 2019 12:43:39 -0800
Subject: [PATCH] Disambiguate asset manifest path

---
 eng/Publishing.props | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 7c43afbf8..ff1a990bc 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -13,6 +13,12 @@
     <ChecksumsAccountKey>$(DotNetPublishChecksumsBlobFeedKey)</ChecksumsAccountKey>
     <SdkAssetsFeedUrl>$(DotnetPublishSdkAssetsBlobFeedUrl)</SdkAssetsFeedUrl>
     <SdkAssetsAzureAccountKey>$(DotNetPublishSdkAssetsBlobFeedKey)</SdkAssetsAzureAccountKey>
+    <!-- Because we may be building in a container, we should use an asset manifest file path
+         that exists in the container. Disambiguate the manifests via RID -->
+    <AssetManifestFileName>$(OS)-$(PlatformName)</AssetManifestFileName>
+    <AssetManifestFileName Condition="'$(Rid)' != ''">$(AssetManifestFileName)-$(Rid)</AssetManifestFileName>
+    <AssetManifestFileName>$(AssetManifestFileName).xml</AssetManifestFileName>
+    <AssetManifestFilePath>$(ArtifactsLogDir)AssetManifests\$(AssetManifestFileName)</AssetManifestFilePath>
 
     <PublishSdkAssetsAndChecksumsToBlob>false</PublishSdkAssetsAndChecksumsToBlob>
     <PublishSdkAssetsAndChecksumsToBlob Condition=" '$(ChecksumsFeedUrl)' != '' and '$(SdkAssetsFeedUrl)' != '' ">true</PublishSdkAssetsAndChecksumsToBlob>