Skip to content
Browse files

Fixed OpenID Offline Provider build .targets so that it includes log4…

…net.dll which is required.
  • Loading branch information...
1 parent 6115cc1 commit c0898dc34cb38e002c24e6f91ff3515374b84428 @AArnott AArnott committed
Showing with 11 additions and 5 deletions.
  1. +1 −1 EnlistmentInfo.props
  2. +10 −4 samples/tools.proj
View
2 EnlistmentInfo.props
@@ -5,6 +5,6 @@
<StyleCopTreatErrorsAsWarnings Condition=" '$(StyleCopTreatErrorsAsWarnings)' == '' and '$(Configuration)' == 'Release' ">false</StyleCopTreatErrorsAsWarnings>
<StyleCopTreatErrorsAsWarnings Condition=" '$(StyleCopTreatErrorsAsWarnings)' == '' ">true</StyleCopTreatErrorsAsWarnings>
- <ProjectRoot>$(MSBuildThisFileDirectory)\</ProjectRoot>
+ <ProjectRoot>$(MSBuildThisFileDirectory)</ProjectRoot>
</PropertyGroup>
</Project>
View
14 samples/tools.proj
@@ -15,13 +15,19 @@
</ToolProjects>
</ItemGroup>
- <MSBuild Projects="@(ToolProjects)" Targets="%(ToolProjects.Targets)" BuildInParallel="$(BuildInParallel)">
- <Output TaskParameter="TargetOutputs" ItemName="OfflineProvider"/>
+ <MSBuild Projects="@(ToolProjects)" Targets="%(ToolProjects.Targets);BuiltProjectOutputGroupDependencies" BuildInParallel="$(BuildInParallel)">
+ <Output TaskParameter="TargetOutputs" ItemName="ToolProjectsOutputs"/>
</MSBuild>
<ItemGroup>
- <!-- Remove the un-unified assembly. -->
- <OfflineProvider Remove="$(OutputPath)$(SignedSubPath)$(ProductName).dll" />
+ <!-- Exclude the un-unified assemblies. -->
+ <OfflineProvider Include="@(ToolProjectsOutputs)"
+ Condition=" '%(ToolProjectsOutputs.CopyLocal)' != 'false' "
+ Exclude="
+ $(OutputPath)$(SignedSubPath)$(ProductName).dll;
+ $(ProjectRoot)lib\Microsoft.Contracts.dll;
+ " />
+
<!-- add the PDBs -->
<OfflineProvider Include="@(OfflineProvider->'%(SymbolPath)')" />
<OfflineProviderTargets Include="

0 comments on commit c0898dc

Please sign in to comment.
Something went wrong with that request. Please try again.