From 806e995f587952ee3fc23acb7f1ac9bceb6d790c Mon Sep 17 00:00:00 2001
From: Nate McMaster <nate.mcmaster@microsoft.com>
Date: Tue, 9 Jan 2018 15:06:04 -0800
Subject: [PATCH] Add workaround for dotnet/buildtools#1855 - don't publish
 duplicate blobs for orchestrated builds

---
 build/Publish.targets | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/build/Publish.targets b/build/Publish.targets
index ea93136ba0..e0c2eacc5b 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -91,12 +91,14 @@
         <RelativeBlobPath>$(BlobBasePath)$(InstallerBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)</RelativeBlobPath>
       </FilesToPublish>
 
+      <!-- Support for README badges and dotnet-install.ps1/sh -->
       <FilesToPublish Include="$(DependencyAssetsDir)$(InstallerBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)" Condition=" '%(NativeInstaller.FileExt)' != '' ">
         <RelativeBlobPath>$(AliasBlobBasePath)$(InstallerAliasBaseFileName)-%(NativeInstaller.Identity)%(NativeInstaller.FileExt)</RelativeBlobPath>
         <Overwrite>true</Overwrite>
+        <!-- These uploads duplicate the same blob in a separate location for README download links and to make dotnet-install.ps1/sh work when specifying -Channel. -->
+        <IsDuplicateUpload>true</IsDuplicateUpload>
       </FilesToPublish>
 
-      <!-- Support for README badges and dotnet-install.ps1/sh -->
       <FilesToPublish Include="@(SharedFxVersionBadge)">
         <RelativeBlobPath>$(AliasBlobBasePath)%(SharedFxVersionBadge.FileName)%(SharedFxVersionBadge.Extension)</RelativeBlobPath>
         <CacheControl>no-cache, no-store, must-revalidate</CacheControl>
@@ -160,7 +162,11 @@
 
     <ItemGroup>
       <PackagesToPublishToTransport Include="@(PackagesToPublish)" Condition=" '%(PackagesToPublish.IsSymbolsPackage)' != 'true' " />
-      <FilesToPublishToTransport Include="@(FilesToPublish)" RelativeBlobPath="$(BlobFileRelativePathBase)%(FilesToPublish.RelativeBlobPath)" />
+
+      <!-- Filter aliased artifacts to workaround dotnet/buildtools#1855 -->
+      <FilesToPublishToTransport Include="@(FilesToPublish)"
+        RelativeBlobPath="$(BlobFileRelativePathBase)%(FilesToPublish.RelativeBlobPath)"
+        Condition=" '%(FilesToPublish.IsDuplicateUpload)' != 'true' " />
     </ItemGroup>
 
     <Message Text="Publishing %(PackagesToPublishToTransport.FullPath)" Importance="high" />