diff options
| author | Andrew Arnott <andrewarnott@gmail.com> | 2010-11-24 22:02:32 -0800 |
|---|---|---|
| committer | Andrew Arnott <andrewarnott@gmail.com> | 2010-11-24 22:02:32 -0800 |
| commit | c0898dc34cb38e002c24e6f91ff3515374b84428 (patch) | |
| tree | d021b47cd70dde2beb8f82740169803ce0fc6989 | |
| parent | 6115cc19190ef7ddf8b02a0370ea4279f09d76e4 (diff) | |
| download | DotNetOpenAuth-c0898dc34cb38e002c24e6f91ff3515374b84428.zip DotNetOpenAuth-c0898dc34cb38e002c24e6f91ff3515374b84428.tar.gz DotNetOpenAuth-c0898dc34cb38e002c24e6f91ff3515374b84428.tar.bz2 | |
Fixed OpenID Offline Provider build .targets so that it includes log4net.dll which is required.
| -rw-r--r-- | EnlistmentInfo.props | 2 | ||||
| -rw-r--r-- | samples/tools.proj | 14 |
2 files changed, 11 insertions, 5 deletions
diff --git a/EnlistmentInfo.props b/EnlistmentInfo.props index 69cacb4..0c5d62d 100644 --- a/EnlistmentInfo.props +++ b/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>
\ No newline at end of file diff --git a/samples/tools.proj b/samples/tools.proj index e7d89d9..99432f8 100644 --- a/samples/tools.proj +++ b/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=" |