Add target to remove binding redirect (dotnet/corefx#35828)

* Add target to remove binding redirect * Update name of target to not collide with WindowsRuntime target Commit migrated from dotnet/corefx@ca106c2
shadow-cs · Mar 8, 2019 · 9b877cb · 9b877cb
1 parent 2b91fd2
commit 9b877cb
Show file tree

Hide file tree

Showing 5 changed files with 45 additions and 0 deletions.
diff --git a/...time.WindowsRuntime.UI.Xaml/pkg/build/net45/System.Runtime.WindowsRuntime.UI.Xaml.targets b/...time.WindowsRuntime.UI.Xaml/pkg/build/net45/System.Runtime.WindowsRuntime.UI.Xaml.targets
@@ -19,4 +19,13 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- when this package is referenced as a nuget reference the binding redirect is still present, add a target to remove it -->
+  <Target Name="_RemoveWindowsRuntimeUIXamlSuggestedRedirect" 
+      BeforeTargets="GenerateBindingRedirects" 
+      DependsOnTargets="ResolveAssemblyReferences"
+      Condition="'$(DoNotReferenceWinRT)' != 'true'">
+    <ItemGroup> 
+      <SuggestedBindingRedirects Remove="System.Runtime.WindowsRuntime.UI.Xaml, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
+    </ItemGroup> 
+  </Target>
 </Project>
diff --git a/...ime.WindowsRuntime.UI.Xaml/pkg/build/net461/System.Runtime.WindowsRuntime.UI.Xaml.targets b/...ime.WindowsRuntime.UI.Xaml/pkg/build/net461/System.Runtime.WindowsRuntime.UI.Xaml.targets
@@ -19,4 +19,13 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- when this package is referenced as a nuget reference the binding redirect is still present, add a target to remove it -->
+  <Target Name="_RemoveWindowsRuntimeUIXamlSuggestedRedirect" 
+      BeforeTargets="GenerateBindingRedirects" 
+      DependsOnTargets="ResolveAssemblyReferences"
+      Condition="'$(DoNotReferenceWinRT)' != 'true'">
+    <ItemGroup> 
+      <SuggestedBindingRedirects Remove="System.Runtime.WindowsRuntime.UI.Xaml, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
+    </ItemGroup> 
+  </Target>
 </Project>
diff --git a/...aries/System.Runtime.WindowsRuntime/pkg/build/net45/System.Runtime.WindowsRuntime.targets b/...aries/System.Runtime.WindowsRuntime/pkg/build/net45/System.Runtime.WindowsRuntime.targets
@@ -20,4 +20,13 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- when this package is referenced as a nuget reference the binding redirect is still present, add a target to remove it -->
+  <Target Name="_RemoveWindowsRuntimeSuggestedRedirect" 
+      BeforeTargets="GenerateBindingRedirects" 
+      DependsOnTargets="ResolveAssemblyReferences"
+      Condition="'$(DoNotReferenceWinRT)' != 'true'">
+    <ItemGroup> 
+      <SuggestedBindingRedirects Remove="System.Runtime.WindowsRuntime, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
+    </ItemGroup> 
+  </Target>
 </Project>
diff --git a/...ries/System.Runtime.WindowsRuntime/pkg/build/net451/System.Runtime.WindowsRuntime.targets b/...ries/System.Runtime.WindowsRuntime/pkg/build/net451/System.Runtime.WindowsRuntime.targets
@@ -19,4 +19,13 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- when this package is referenced as a nuget reference the binding redirect is still present, add a target to remove it -->
+  <Target Name="_RemoveWindowsRuntimeSuggestedRedirect" 
+      BeforeTargets="GenerateBindingRedirects" 
+      DependsOnTargets="ResolveAssemblyReferences"
+      Condition="'$(DoNotReferenceWinRT)' != 'true'">
+    <ItemGroup> 
+      <SuggestedBindingRedirects Remove="System.Runtime.WindowsRuntime, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
+    </ItemGroup> 
+  </Target>
 </Project>
diff --git a/...ries/System.Runtime.WindowsRuntime/pkg/build/net461/System.Runtime.WindowsRuntime.targets b/...ries/System.Runtime.WindowsRuntime/pkg/build/net461/System.Runtime.WindowsRuntime.targets
@@ -19,4 +19,13 @@
       </ItemGroup>
     </When>
   </Choose>
+  <!-- when this package is referenced as a nuget reference the binding redirect is still present, add a target to remove it -->
+  <Target Name="_RemoveWindowsRuntimeSuggestedRedirect" 
+      BeforeTargets="GenerateBindingRedirects" 
+      DependsOnTargets="ResolveAssemblyReferences"
+      Condition="'$(DoNotReferenceWinRT)' != 'true'">
+    <ItemGroup> 
+      <SuggestedBindingRedirects Remove="System.Runtime.WindowsRuntime, Culture=neutral, PublicKeyToken=b77a5c561934e089" /> 
+    </ItemGroup> 
+  </Target>
 </Project>