diff options
| -rw-r--r-- | doc/doc.proj | 4 | ||||
| -rw-r--r-- | tools/Documentation.targets | 8 | ||||
| -rw-r--r-- | tools/sandcastle.targets | 12 |
3 files changed, 18 insertions, 6 deletions
diff --git a/doc/doc.proj b/doc/doc.proj index 55b2cb8..c966eb8 100644 --- a/doc/doc.proj +++ b/doc/doc.proj @@ -11,8 +11,8 @@ --> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))\EnlistmentInfo.props" Condition=" '$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), EnlistmentInfo.props))' != '' " /> <Import Project="..\tools\DotNetOpenAuth.automated.props"/> - - <Target Name="Build" DependsOnTargets="BuildProduct;Chm" Condition=" '$(NoDocumentation)' != 'true' " /> + + <Target Name="Build" DependsOnTargets="BuildUnifiedProduct;Chm" Condition=" '$(NoDocumentation)' != 'true' " /> <Target Name="Prepare"> <Error Text="The BranchName property must be set." Condition=" '$(BranchName)' == '' " /> diff --git a/tools/Documentation.targets b/tools/Documentation.targets index faf1f75..74efe3d 100644 --- a/tools/Documentation.targets +++ b/tools/Documentation.targets @@ -4,10 +4,16 @@ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> <OutputAssembly>DotNetOpenAuth</OutputAssembly> + <OutputAssemblyFile>$(ILMergeOutputAssembly)</OutputAssemblyFile> <DocOutputPath>$(ProjectRoot)doc\</DocOutputPath> - <DocumentationFile>$(OutputPath)$(OutputAssembly).xml</DocumentationFile> + <DocumentationFile>$(ILMergeOutputXmlDocs)</DocumentationFile> </PropertyGroup> + <ItemGroup> + <MRefDependencies Include="$(ProjectRoot)lib\log4net.dll" /> + <MRefDependencies Include="$(ProjectRoot)lib\net-v3.5\System.Web.Mvc.dll" /> + </ItemGroup> + <Import Project="$(ProjectRoot)Tools\sandcastle.targets" /> </Project> diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets index 65511f8..c7860b7 100644 --- a/tools/sandcastle.targets +++ b/tools/sandcastle.targets @@ -11,7 +11,7 @@ <Presentation>$(DxRoot)Presentation\$(PresentationStyle)\</Presentation> <HHC>$(PROGRAMFILES)\Html Help Workshop\hhc.exe</HHC> - <OutputAssemblyFile>$(OutputPath)$(OutputAssembly).dll</OutputAssemblyFile> + <OutputAssemblyFile Condition=" '$(OutputAssemblyFile)' == '' ">$(OutputPath)$(OutputAssembly).dll</OutputAssemblyFile> <DocOutputApiPath>$(DocOutputPath)api\</DocOutputApiPath> <DocIntermediatePath>$(ProjectRoot)obj\Doc\$(Configuration)\</DocIntermediatePath> @@ -114,9 +114,15 @@ <MakeDir Directories="$(DocOutputApiPath)html;$(DocOutputApiPath)media;$(DocOutputApiPath)intellisense"/> </Target> - <Target Name="ReflectionBase" Inputs="$(OutputAssemblyFile)" Outputs="$(ReflectionBaseFile)" + <Target Name="ReflectionBase" Inputs="$(OutputAssemblyFile)" Outputs="$(ReflectionBaseFile)" DependsOnTargets="SetEnvironmentVars;CreateIntermediatePath;ProductionTools"> - <Exec Command='"$(ProductionTools)MRefBuilder.exe" "$(OutputAssemblyFile)" /out:"$(ReflectionBaseFile)"' /> + <ItemGroup> + <MRefDependenciesSwitch Include="@(MRefDependencies->'/dep:"%(Identity)"')" /> + </ItemGroup> + <PropertyGroup> + <MRefDependenciesSwitch>@(MRefDependenciesSwitch,' ')</MRefDependenciesSwitch> + </PropertyGroup> + <Exec Command='"$(ProductionTools)MRefBuilder.exe" "$(OutputAssemblyFile)" /out:"$(ReflectionBaseFile)" $(MRefDependenciesSwitch)' /> </Target> <Target Name="ReflectionData" DependsOnTargets="FxReflection;ReflectionBase" Inputs="$(ReflectionBaseFile)" Outputs="$(ReflectionFile)"> |