Skip to content

Commit

Permalink
Set AutoUnifyAssemblyReferences only if it hasn't already been set (#…
Browse files Browse the repository at this point in the history
…1019)

For .NET Core projects, we want to pass AutoUnify=true to the RAR task. That gets set through the AutoUnifyAssemblyReferences property which derives its value from the AutoGenerateBindingRedirects property. It’s odd to have AutoGenerateBindingRedirects=true in the NETCore.props given binding redirects don’t mean anything in .NETCore. This change makes it so that we can set AutoUnifyAssemblyReferences in the props file.
  • Loading branch information
srivatsn authored and rainersigwald committed Sep 13, 2016
1 parent 5161aeb commit 4d260f7
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion src/XMakeTasks/Microsoft.Common.CurrentVersion.targets
Original file line number Diff line number Diff line change
Expand Up @@ -318,9 +318,11 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<PropertyGroup>
<GenerateBindingRedirectsOutputType Condition="'$(OutputType)'=='exe' or '$(OutputType)'=='winexe'">true</GenerateBindingRedirectsOutputType>
</PropertyGroup>
<PropertyGroup>
<PropertyGroup Condition="'$(AutoUnifyAssemblyReferences)' == ''">
<AutoUnifyAssemblyReferences>true</AutoUnifyAssemblyReferences>
<AutoUnifyAssemblyReferences Condition="'$(GenerateBindingRedirectsOutputType)' == 'true' and '$(AutoGenerateBindingRedirects)' != 'true'">false</AutoUnifyAssemblyReferences>
</PropertyGroup>
<PropertyGroup>
<BaseIntermediateOutputPath Condition="'$(BaseIntermediateOutputPath)'=='' ">obj\</BaseIntermediateOutputPath>
<BaseIntermediateOutputPath Condition="!HasTrailingSlash('$(BaseIntermediateOutputPath)')">$(BaseIntermediateOutputPath)\</BaseIntermediateOutputPath>
<CleanFile Condition="'$(CleanFile)'==''">$(MSBuildProjectFile).FileListAbsolute.txt</CleanFile>
Expand Down

0 comments on commit 4d260f7

Please sign in to comment.