Build custom tasks for net45 on Windows, even when building in source-build.

Commit migrated from https://github.com/dotnet/core-setup/commit/1063874bdcff70192516ba374c173296eeb84301

diff --git a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds
index 41939dc..9a68fad 100644 (file)
--- a/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds
+++ b/tools-local/Microsoft.DotNet.Build.Tasks.Local/Microsoft.DotNet.Build.Tasks.Local.builds
@@ -6,7 +6,7 @@
       <AdditionalProperties>TargetGroup=netstandard1.5</AdditionalProperties>
     </Project>
     <Project Include="$(MSBuildThisFileDirectory)$(MSBuildProjectName).csproj"
-             Condition="'$(DotNetBuildFromSource)' != 'true'">
+             Condition="'$(BuildCustomTasksForDesktop)' == 'true'">
       <AdditionalProperties>TargetGroup=net45</AdditionalProperties>
     </Project>
   </ItemGroup>

diff --git a/tools-local/dir.props b/tools-local/dir.props
new file mode 100644 (file)
index 0000000..ed4b80b
--- /dev/null
+++ b/tools-local/dir.props
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\dir.props" />
+
+  <PropertyGroup>
+    <BuildCustomTasksForDesktop Condition="'$(MSBuildRuntimeType)' != 'Core'">true</BuildCustomTasksForDesktop>
+  </PropertyGroup>
+
+</Project>
\ No newline at end of file

diff --git a/tools-local/tasks/core-setup.tasks.builds b/tools-local/tasks/core-setup.tasks.builds
index 41939dc..9a68fad 100644 (file)
--- a/tools-local/tasks/core-setup.tasks.builds
+++ b/tools-local/tasks/core-setup.tasks.builds
@@ -6,7 +6,7 @@
       <AdditionalProperties>TargetGroup=netstandard1.5</AdditionalProperties>
     </Project>
     <Project Include="$(MSBuildThisFileDirectory)$(MSBuildProjectName).csproj"
-             Condition="'$(DotNetBuildFromSource)' != 'true'">
+             Condition="'$(BuildCustomTasksForDesktop)' == 'true'">
       <AdditionalProperties>TargetGroup=net45</AdditionalProperties>
     </Project>
   </ItemGroup>