Merge pull request #773 from dotnet-maestro-bot/merge/release/2.2-to-master

[automated] Merge branch 'release/2.2' => 'master'

Author: dagood

dir.props

@@ -46,7 +46,7 @@
     <ToolPackageExtractDir>$(ToolsDir)source-built/</ToolPackageExtractDir>
     <ToolsLocalDir>$(ProjectDir)tools-local/</ToolsLocalDir>
     <TaskDirectory>$(ToolsLocalDir)tasks/</TaskDirectory>
-    <TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard2.0/</TasksBinDir>
+    <TasksBinDir>$(TaskDirectory)Microsoft.DotNet.SourceBuild.Tasks/bin/Debug/netstandard1.5/</TasksBinDir>
     <BaseIntermediatePath>$(BaseOutputPath)obj/</BaseIntermediatePath>
     <OutputPath>$(BaseOutputPath)$(Platform)/$(Configuration)/</OutputPath>
     <IntermediatePath>$(BaseIntermediatePath)$(Platform)/$(Configuration)/</IntermediatePath>

patches/vstest/0001-Conditionally-remove-uap-from-TargetFramework.patch

@@ -0,0 +1,24 @@
+From 81f7e530100315ccd2d18048c45772d035bd5eee Mon Sep 17 00:00:00 2001
+From: dseefeld <dseefeld@microsoft.com>
+Date: Wed, 12 Sep 2018 18:27:49 +0000
+Subject: [PATCH] Conditionally remove uap from TargetFramework
+
+---
+ .../Microsoft.TestPlatform.PlatformAbstractions.csproj                   | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+index b89400e..31ba348 100644
+--- a/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
++++ b/src/Microsoft.TestPlatform.PlatformAbstractions/Microsoft.TestPlatform.PlatformAbstractions.csproj
+@@ -7,6 +7,7 @@
+   <PropertyGroup>
+     <AssemblyName>Microsoft.TestPlatform.PlatformAbstractions</AssemblyName>
+     <TargetFrameworks>netstandard1.0;netcoreapp1.0;net451;uap10.0</TargetFrameworks>
++    <TargetFrameworks Condition=" '$(DotNetBuildFromSource)' == 'true' ">netstandard1.0;netcoreapp1.0;net451</TargetFrameworks>
+     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
+     <EnableCodeAnalysis>true</EnableCodeAnalysis>
+   </PropertyGroup>
+-- 
+1.8.3.1
+