Merge pull request dotnet#46 from aspnet/MsBuildRuntimeType

Fixing the task to use the right name based on MSBuildRuntimeType
mmitche · Oct 22, 2016 · 18bf05b · 18bf05b
2 parents b6ed8b8 + 025da65
commit 18bf05b
Showing 1 changed file with 2 additions and 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
@@ -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>