From a0b8eeb8c95a1e3037c743aff705bdf06b3d76ab Mon Sep 17 00:00:00 2001
From: Livar Cunha <livar@live.com>
Date: Wed, 26 Dec 2018 11:42:24 -0800
Subject: [PATCH] Prevent attempting to publish duplicate badge and checksum
 files.

---
 .vsts-ci.yml         | 4 ++--
 eng/Publishing.props | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.vsts-ci.yml b/.vsts-ci.yml
index 085d993dd..639af36b9 100644
--- a/.vsts-ci.yml
+++ b/.vsts-ci.yml
@@ -209,7 +209,7 @@ jobs:
             _DropSuffix: ''
             # Do not publish zips and tarballs. The linux-x64 binaries are
             # already published by Build_LinuxPortable_Release_x64
-            _AdditionalBuildParameters: '/p:PublishBinaries=false'
+            _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
           Build_Linux_Portable_Rpm_Release_x64:
             _BuildConfig: Release
             _DockerParameter: '--docker rhel'
@@ -219,7 +219,7 @@ jobs:
             _DropSuffix: ''
             # Do not publish zips and tarballs. The linux-x64 binaries are
             # already published by Build_LinuxPortable_Release_x64
-            _AdditionalBuildParameters: '/p:PublishBinaries=false'
+            _AdditionalBuildParameters: '/p:PublishBinariesAndBadge=false'
         Build_LinuxPortable_Release_x64:
           _BuildConfig: Release
           _DockerParameter: ''
diff --git a/eng/Publishing.props b/eng/Publishing.props
index 04dcd407a..05fc2b358 100644
--- a/eng/Publishing.props
+++ b/eng/Publishing.props
@@ -17,14 +17,14 @@
     <PublishSdkAssetsAndChecksumsToBlob>false</PublishSdkAssetsAndChecksumsToBlob>
     <PublishSdkAssetsAndChecksumsToBlob Condition=" '$(ChecksumsFeedUrl)' != '' and '$(SdkAssetsFeedUrl)' != '' ">true</PublishSdkAssetsAndChecksumsToBlob>
 
-    <PublishBinaries Condition=" '$(PublishBinaries)' == '' ">true</PublishBinaries>
+    <PublishBinariesAndBadge Condition=" '$(PublishBinariesAndBadge)' == '' ">true</PublishBinariesAndBadge>
   </PropertyGroup>
 
   <Import Project="$(NuGetPackageRoot)microsoft.dotnet.build.tasks.feed\$(MicrosoftDotNetBuildTasksFeedVersion)\build\Microsoft.DotNet.Build.Tasks.Feed.targets" Condition=" '$(PublishSdkAssetsAndChecksumsToBlob)' == 'true' " />
 
   <ItemGroup>
-    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinaries)' == 'true' " />
-    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.tar.gz" Condition=" '$(PublishBinaries)' == 'true' " />
+    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.zip" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
+    <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.tar.gz" Condition=" '$(PublishBinariesAndBadge)' == 'true' " />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.pkg" />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.exe" />
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.deb" />
@@ -34,6 +34,8 @@
     <SdkAssetsToPublish Include="$(ArtifactsShippingPackagesDir)*.svg" />
 
     <CheckSumsToPublish Include="$(ArtifactsShippingPackagesDir)*.sha" />
+    <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.zip.sha" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/>
+    <CheckSumsToPublish Remove="$(ArtifactsShippingPackagesDir)*.tar.gz.sha" Condition=" '$(PublishBinariesAndBadge)' == 'false' "/>
   </ItemGroup>
 
   <Target Name="PublishSdkAssetsAndChecksums"