From f62aab0970c4b3c736e940280bf87fb0211d9c0d Mon Sep 17 00:00:00 2001
From: Faizan Ahmad <faahmad@microsoft.com>
Date: Tue, 21 Mar 2017 06:58:01 -0700
Subject: [PATCH 1/2] Issue: 1) https://github.com/Microsoft/vstest/issues/613
 2) https://github.com/Microsoft/vstest/issues/428 3)
 https://github.com/Microsoft/vstest/issues/391 4)
 https://github.com/Microsoft/vstest/issues/595

Fix:
Generate config file for test project targeting .NET Framework. This config file has have binding redirect which is needed at time of running tests.
---
 src/package/nuspec/Microsoft.NET.Test.Sdk.targets | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index 53f66d266d..9519b27f8d 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
@@ -41,6 +41,15 @@
   <PropertyGroup>
     <DebugType Condition="'$(TargetFrameworkIdentifier)' != '.NETCoreApp'">Full</DebugType>
   </PropertyGroup>
+ 
+  <!--
+     Generate config file for test project targeting .NET Framework. This config file has have binding redirect which
+	 is needed at time of running tests.
+   -->
+  <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+  </PropertyGroup>
 
   <!--
      Note that this must run before every invocation of CoreCompile to ensure that all

From 90d1072617aa8eeb307fde08fc21b207532c96ae Mon Sep 17 00:00:00 2001
From: Faizan Ahmad <faahmad@microsoft.com>
Date: Wed, 22 Mar 2017 03:44:36 -0700
Subject: [PATCH 2/2] Added comment

---
 src/package/nuspec/Microsoft.NET.Test.Sdk.targets | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
index 9519b27f8d..ff21e3663e 100644
--- a/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
+++ b/src/package/nuspec/Microsoft.NET.Test.Sdk.targets
@@ -43,8 +43,9 @@
   </PropertyGroup>
  
   <!--
-     Generate config file for test project targeting .NET Framework. This config file has have binding redirect which
-	 is needed at time of running tests.
+     Generate config file for test project targeting .NET Framework. This config file has have binding redirect which is needed at time of running tests.
+     Added below two lines because msbuild has following check:
+     https://github.com/Microsoft/msbuild/blob/dd5e8bc3f86ac98bd77d8971b00a6ad14f122f1a/src/XMakeTasks/Microsoft.Common.CurrentVersion.targets#L2027 
    -->
   <PropertyGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>