From 3b7f13e179925c5ae369267e5310306b48e5f4cc Mon Sep 17 00:00:00 2001
From: John Beisner <jbeisner@microsoft.com>
Date: Fri, 29 Sep 2017 13:58:08 -0700
Subject: [PATCH] The publish logic needs to change with the addition of RedHat
 6.

"IsLinuxDistroSpecific" was used only to decide whether to publish zip/tar files - changes to "PublishArchives" & includes RedHat 6 per 'DerivedHostMachineInfo.props'

"IslinuxPortable" was used to decide, among other things, whether to publish the installer packages - changes to "PublishNativeInstallers" & excludes RedHat 6 per 'DerivedHostMachineInfo.props'
---
 build/DerivedHostMachineInfo.props | 6 ++++--
 build/Publish.targets              | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/build/DerivedHostMachineInfo.props b/build/DerivedHostMachineInfo.props
index 3e77dad8c..944892975 100644
--- a/build/DerivedHostMachineInfo.props
+++ b/build/DerivedHostMachineInfo.props
@@ -1,7 +1,9 @@
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <PropertyGroup>
       <IsDebianBaseDistro Condition=" '$(HostOSName)' == 'ubuntu' OR '$(HostOSName)' == 'debian' ">true</IsDebianBaseDistro>
-      <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) ">true</IsRPMBasedDistro>
-      <IsLinuxDistroSpecific Condition=" ('$(IsDebianBaseDistro)' == 'true' OR '$(IsRPMBasedDistro)' == 'true') AND '$(IslinuxPortable)' != 'true' ">true</IsLinuxDistroSpecific>
+      <IsRPMBasedDistro Condition=" $(HostRid.StartsWith('rhel')) AND '$(HostRid)' != 'rhel.6-x64' ">true</IsRPMBasedDistro>
+
+      <PublishNativeInstallers Condition=" '$(IslinuxPortable)' != 'true' AND '$(HostRid)' != 'rhel.6-x64' "></PublishNativeInstallers>
+      <PublishArchives Condition=" '$(IslinuxPortable)' == 'true' OR ('$(IsDebianBaseDistro)' != 'true' AND '$(IsRPMBasedDistro)' != 'true') ">true</PublishArchives>
     </PropertyGroup>
 </Project>
diff --git a/build/Publish.targets b/build/Publish.targets
index c200c4c66..24dcc1a50 100644
--- a/build/Publish.targets
+++ b/build/Publish.targets
@@ -39,9 +39,9 @@
   <Target Name="GatherItemsForPattern">
     <ItemGroup>
       <ForPublishing Include="@(GeneratedInstallers)"
-                     Condition=" '$(IslinuxPortable)' != 'true' "/>
+                     Condition=" '$(PublishNativeInstallers)' == 'true' "/>
       <ForPublishing Include="%(GenerateArchivesInputsOutputs.Outputs)"
-                     Condition=" '$(IsLinuxDistroSpecific)' != 'true' "/>
+                     Condition=" '$(PublishArchives)' == 'true' "/>
       <ForPublishing Include="$(PackagesDirectory)/Microsoft*.nupkg"
                      Condition=" '$(PUBLISH_NUPKG_TO_AZURE_BLOB)' != '' AND '$(OS)' == 'Windows_NT' And '$(Architecture)' == 'x64' "/>
       <ForPublishing Include="$(PackagesDirectory)/VS.Redist.Common.Net.Core.SDK.$(Architecture)*.nupkg"
@@ -83,4 +83,4 @@
       ContainerName="$(ArtifactContainerName)"
       Items="@(CliVersionBadgeToUpload)" />
   </Target>
-</Project>
\ No newline at end of file
+</Project>