From a0a6844e0b4972db89a9b39e7210df82cab39eb0 Mon Sep 17 00:00:00 2001
From: Christopher Costa <chcosta@microsoft.com>
Date: Mon, 28 Jan 2019 10:32:29 -0800
Subject: [PATCH] Differentiate manifests

---
 eng/Publishing.props | 11 ++++++-----
 eng/dockerrun.sh     |  2 ++
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/eng/Publishing.props b/eng/Publishing.props
index 12ede2957..582fb2be8 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -24,11 +24,12 @@
   
   <PropertyGroup>
       <!-- 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 and architecture -->
-      <AssetManifestFileName Condition="'$(AGENT_OS)' != ''">$(AGENT_OS)-$(PlatformName)</AssetManifestFileName>
-      <AssetManifestFileName Condition="'$(AGENT_OS)' == ''">$(OS)-$(PlatformName)</AssetManifestFileName>
-      <AssetManifestFileName Condition="'$(Rid)' != ''">$(AssetManifestFileName)-$(Rid)</AssetManifestFileName>
-      <AssetManifestFileName Condition="'$(Architecture)' != ''">$(AssetManifestFileName)-$(Architecture)</AssetManifestFileName>
+             that exists in the container. Disambiguate the manifests via available properties.
+             AGENT_OS and AGENT_JOBNAME are present on Azure DevOps agents -->
+      <AssetManifestFileName Condition="'$(AGENT_OS)' != ''">$(AGENT_OS)</AssetManifestFileName>
+      <AssetManifestFileName Condition="'$(AGENT_OS)' == ''">$(OS)</AssetManifestFileName>
+      <AssetManifestFileName Condition="'$(AGENT_JOBNAME)' != ''">$(AssetManifestFileName)-$(AGENT_JOBNAME)</AssetManifestFileName>
+      <AssetManifestFileName Condition="'$(AGENT_JOBNAME)' == '' and '$(Architecture)' != ''">$(AssetManifestFileName)-$(Architecture)</AssetManifestFileName>
       <ChecksumsAssetManifestFileName>$(AssetManifestFileName)-checksums</ChecksumsAssetManifestFileName>
       <!-- Property AssetManifestFilePath will be reassigned by the Arcade SDK, so use a different name (DotNetAssetManifestFilePath) -->
       <DotNetAssetManifestFilePath>$(ArtifactsLogDir)AssetManifest\$(AssetManifestFileName).xml</DotNetAssetManifestFilePath>
diff --git a/eng/dockerrun.sh b/eng/dockerrun.sh
index 6a3634bc5..15ecbffe3 100755
--- a/eng/dockerrun.sh
+++ b/eng/dockerrun.sh
@@ -148,5 +148,7 @@ docker run $INTERACTIVE -t --rm --sig-proxy=true \
     -e BUILD_SOURCEBRANCH \
     -e BUILD_BUILDNUMBER \
     -e BUILD_SOURCEVERSION \
+    -e AGENT_JOBNAME \
+    -e AGENT_OS \
     $DOTNET_BUILD_CONTAINER_TAG \
     $BUILD_COMMAND "$@"