From 04608a8975d0b428ea70b3145e1e5daf2da162d8 Mon Sep 17 00:00:00 2001
From: Nikita Tsukanov <keks9n@gmail.com>
Date: Sun, 23 Jul 2017 02:34:26 +0300
Subject: [PATCH] Enforce binding redirect generation

---
 build/XUnit.props | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/build/XUnit.props b/build/XUnit.props
index 27e0afc987..d59cee6536 100644
--- a/build/XUnit.props
+++ b/build/XUnit.props
@@ -12,4 +12,16 @@
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp1.1'">
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.0.0" />
   </ItemGroup>
+  <PropertyGroup>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <Target Name="ForceGenerationOfBindingRedirects"
+          AfterTargets="ResolveAssemblyReferences"
+          BeforeTargets="GenerateBindingRedirects"
+          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+    <PropertyGroup>
+      <!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
+      <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    </PropertyGroup>
+  </Target>
 </Project>