From 025da65f80fbc2732e06c0c2d6aad3ccdeea40d8 Mon Sep 17 00:00:00 2001
From: Vijay Ramakrishnan <vramak@microsoft.com>
Date: Fri, 21 Oct 2016 16:43:27 -0700
Subject: [PATCH] Fixing the task to use the right name based on
 MSBuildRuntimeType

---
 .../Microsoft.NET.Sdk.Publish.targets                          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Publish/Microsoft.NET.Sdk.Publish.Targets/Microsoft.NET.Sdk.Publish.targets b/src/Publish/Microsoft.NET.Sdk.Publish.Targets/Microsoft.NET.Sdk.Publish.targets
index 94cb75353504..86ca147c0460 100644
--- a/src/Publish/Microsoft.NET.Sdk.Publish.Targets/Microsoft.NET.Sdk.Publish.targets
+++ b/src/Publish/Microsoft.NET.Sdk.Publish.Targets/Microsoft.NET.Sdk.Publish.targets
@@ -20,9 +20,10 @@ Copyright (C) Microsoft Corporation. All rights reserved.
     <!-- We want to force this property to be true, hence not adding a condition check -->
     <SupportsDeployOnBuild>true</SupportsDeployOnBuild>
     <_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">netcoreapp1.0</_PublishTaskFramework>
+    <_PublishTaskNameSuffix Condition=" '$(MSBuildRuntimeType)' == 'Core'">Core</_PublishTaskNameSuffix>
     <_PublishTaskFramework Condition=" '$(_PublishTaskFramework)' == ''">net46</_PublishTaskFramework>
     <_PublishTasksDir Condition=" '$(_PublishTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\..\tools\$(_PublishTaskFramework)\</_PublishTasksDir>
-    <_PublishTaskAssemblyFullPath Condition=" '$(_PublishTaskAssemblyFullPath)'=='' ">$(_PublishTasksDir)\Microsoft.NET$(MSBuildRuntimeType).Sdk.Publish.Tasks.dll</_PublishTaskAssemblyFullPath>
+    <_PublishTaskAssemblyFullPath Condition=" '$(_PublishTaskAssemblyFullPath)'=='' ">$(_PublishTasksDir)\Microsoft.NET$(_PublishTaskNameSuffix).Sdk.Publish.Tasks.dll</_PublishTaskAssemblyFullPath>
     <_BeforePublishTargetsDir Condition=" '$(_BeforePublishTargetsDir)' == ''">$(MSBuildThisFileDirectory)BeforePublishTargets\</_BeforePublishTargetsDir>
     <_CopyTargetsDir Condition=" '$(_CopyTargetsDir)' == ''">$(MSBuildThisFileDirectory)CopyTargets\</_CopyTargetsDir>
     <_TransformTargetsDir Condition=" '$(_TransformTargetsDir)' == ''">$(MSBuildThisFileDirectory)TransformTargets\</_TransformTargetsDir>