diff options
| -rw-r--r-- | build.proj | 198 | ||||
| -rw-r--r-- | tools/Documentation.targets | 12 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Common.Settings.targets | 16 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.Versioning.targets | 12 | ||||
| -rw-r--r-- | tools/JavascriptPacker.targets | 4 | ||||
| -rw-r--r-- | tools/Publish.targets | 6 | ||||
| -rw-r--r-- | tools/sandcastle.targets | 102 |
7 files changed, 176 insertions, 174 deletions
@@ -2,48 +2,48 @@ <Import Project="$(MSBuildProjectDirectory)\tools\DotNetOpenAuth.Common.Settings.targets"/> <PropertyGroup> <AutomatedBuild>true</AutomatedBuild> - <SolutionPath>$(ProjectRoot)\src\$(ProductName).sln</SolutionPath> - <ILMergeOutputAssemblyDirectory>$(OutputPath)\unified\</ILMergeOutputAssemblyDirectory> - <ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)\$(ProductName).dll</ILMergeOutputAssembly> + <SolutionPath>$(ProjectRoot)src\$(ProductName).sln</SolutionPath> + <ILMergeOutputAssemblyDirectory>$(OutputPath)unified\</ILMergeOutputAssemblyDirectory> + <ILMergeOutputAssembly>$(ILMergeOutputAssemblyDirectory)$(ProductName).dll</ILMergeOutputAssembly> <ProjectTemplatesLayoutPath>$(IntermediatePath)projecttemplates\</ProjectTemplatesLayoutPath> </PropertyGroup> - <Import Project="$(ProjectRoot)\tools\$(ProductName).Versioning.targets"/> - <Import Project="$(ProjectRoot)\tools\Documentation.targets"/> - <Import Project="$(ProjectRoot)\tools\Publish.targets"/> - <UsingTask AssemblyFile="$(ProjectRoot)\lib\MSBuild.Community.Tasks.dll" TaskName="Zip"/> - <UsingTask AssemblyFile="$(ProjectRoot)\lib\MSBuild.Community.Tasks.dll" TaskName="ILMerge"/> + <Import Project="$(ProjectRoot)tools\$(ProductName).Versioning.targets"/> + <Import Project="$(ProjectRoot)tools\Documentation.targets"/> + <Import Project="$(ProjectRoot)tools\Publish.targets"/> + <UsingTask AssemblyFile="$(ProjectRoot)lib\MSBuild.Community.Tasks.dll" TaskName="Zip"/> + <UsingTask AssemblyFile="$(ProjectRoot)lib\MSBuild.Community.Tasks.dll" TaskName="ILMerge"/> <ItemGroup> - <SampleProjects Include="$(ProjectRoot)\samples\**\*.csproj" /> + <SampleProjects Include="$(ProjectRoot)samples\**\*.csproj" /> <SampleSites Include="OAuthConsumer;OAuthServiceProvider;InfoCardRelyingParty" /> - <ProjectTemplates Include="$(ProjectRoot)\projecttemplates\**\*.csproj" /> - <ILMergeInputAssemblies Include="$(OutputPath)\$(ProductName).dll; - $(ProjectRoot)\lib\Microsoft.Contracts.dll; "/> + <ProjectTemplates Include="$(ProjectRoot)projecttemplates\**\*.csproj" /> + <ILMergeInputAssemblies Include="$(OutputPath)$(ProductName).dll; + $(ProjectRoot)lib\Microsoft.Contracts.dll; "/> <DelaySignedAssemblies Include="$(ILMergeOutputAssembly); - $(OutputPath)\$(ProductName).dll; - $(OutputPath)\$(ProductName).Contracts.dll; - $(OutputPath)\$(ProductName).Test.dll; - $(ProjectRoot)\samples\OpenIdOfflineProvider\bin\$(Configuration)\OpenIdOfflineProvider.exe" /> + $(OutputPath)$(ProductName).dll; + $(OutputPath)$(ProductName).Contracts.dll; + $(OutputPath)$(ProductName).Test.dll; + $(ProjectRoot)samples\OpenIdOfflineProvider\bin\$(Configuration)\OpenIdOfflineProvider.exe" /> </ItemGroup> <Target Name="Clean" DependsOnTargets="CleanDocumentation;UnpublishSamples;UnpublishDocumentation"> <MSBuild Projects="$(SolutionPath)" Targets="Clean" /> <ItemGroup> <DirtyDirectories Include=" - $(ProjectRoot)\bin; - $(ProjectRoot)\**\obj; - $(ProjectRoot)\doc\api; + $(ProjectRoot)bin; + $(ProjectRoot)**\obj; + $(ProjectRoot)doc\api; $(DropsRoot); - $(ProjectRoot)\src\PrecompiledWeb; + $(ProjectRoot)src\PrecompiledWeb; $(ProjectTemplatesLayoutPath); " /> <DirtyDirectories Include="@(SampleDirectories->'%(FullPath)\bin')" /> <DirtyDirectories Include="@(SampleDirectories->'%(FullPath)\obj')" /> <DirtyFiles Include=" - $(ProjectRoot)\**\*~; - $(ProjectRoot)\**\*.log*; - $(ProjectRoot)\doc\$(ProductName).chm; + $(ProjectRoot)**\*~; + $(ProjectRoot)**\*.log*; + $(ProjectRoot)doc\$(ProductName).chm; " /> </ItemGroup> <Delete Files="@(DirtyFiles)" /> @@ -55,11 +55,11 @@ </Target> <Target Name="BuildProduct" DependsOnTargets="SkipVerification"> - <MSBuild Projects="$(ProjectRoot)\src\$(ProductName)\$(ProductName).csproj" /> + <MSBuild Projects="$(ProjectRoot)src\$(ProductName)\$(ProductName).csproj" /> </Target> <Target Name="BuildTests" DependsOnTargets="SkipVerification"> - <MSBuild Projects="$(ProjectRoot)\src\$(ProductName).Test\$(ProductName).Test.csproj" /> + <MSBuild Projects="$(ProjectRoot)src\$(ProductName).Test\$(ProductName).Test.csproj" /> </Target> <Target Name="BuildSamples" DependsOnTargets="SkipVerification"> @@ -80,7 +80,7 @@ Inputs="@(ILMergeInputAssemblies)" Outputs="$(ILMergeOutputAssembly)"> <MakeDir Directories="$(ILMergeOutputAssemblyDirectory)" /> - <ILMerge ExcludeFile="$(ProjectRoot)\ILMergeInternalizeExceptions.txt" + <ILMerge ExcludeFile="$(ProjectRoot)ILMergeInternalizeExceptions.txt" InputAssemblies="@(ILMergeInputAssemblies)" OutputFile="$(ILMergeOutputAssembly)" KeyFile="$(PublicKeyFile)" @@ -98,20 +98,20 @@ <Target Name="ToolsLayout" DependsOnTargets="GetBuildVersion;_SetDropProperties;BuildUnifiedProduct"> <PropertyGroup> - <ToolsDirectory>$(DropsRoot)\$(ProductName)-Tools-$(BuildVersion)</ToolsDirectory> + <ToolsDirectory>$(DropsRoot)$(ProductName)-Tools-$(BuildVersion)\</ToolsDirectory> </PropertyGroup> <ItemGroup> - <ToolProjects Include="$(ProjectRoot)\Samples\OpenIdOfflineProvider\OpenIdOfflineProvider.csproj" /> + <ToolProjects Include="$(ProjectRoot)Samples\OpenIdOfflineProvider\OpenIdOfflineProvider.csproj" /> <OfflineProvider Include=" - $(ProjectRoot)\Samples\OpenIdOfflineProvider\bin\$(Configuration)\**\*.dll; + $(ProjectRoot)Samples\OpenIdOfflineProvider\bin\$(Configuration)\**\*.dll; $(ILMergeOutputAssembly).*; - $(ProjectRoot)\Samples\OpenIdOfflineProvider\bin\$(Configuration)\OpenIdOfflineProvider.exe" + $(ProjectRoot)Samples\OpenIdOfflineProvider\bin\$(Configuration)\OpenIdOfflineProvider.exe" Exclude=" - $(ProjectRoot)\Samples\OpenIdOfflineProvider\bin\$(Configuration)\$(ProductName).*; + $(ProjectRoot)Samples\OpenIdOfflineProvider\bin\$(Configuration)\$(ProductName).*; "/> <OfflineProviderTargets Include=" - @(OfflineProvider->'$(ToolsDirectory)\%(RecursiveDir)%(FileName)%(Extension)')"/> + @(OfflineProvider->'$(ToolsDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/> <AllToolSources Include="@(OfflineProvider)" /> <AllToolTargets Include="@(OfflineProviderTargets)" /> @@ -143,20 +143,20 @@ <Target Name="ProjectTemplatesLayout" DependsOnTargets="BuildUnifiedProduct;ReSignDelaySignedAssemblies;BuildProjectTemplates"> <ItemGroup> - <ProjectTemplatesSource Include="$(ProjectRoot)\projecttemplates\**\*" + <ProjectTemplatesSource Include="$(ProjectRoot)projecttemplates\**\*" Exclude=" - $(ProjectRoot)\projecttemplates\**\*.sln.cache; - $(ProjectRoot)\projecttemplates\**\*.suo; - $(ProjectRoot)\projecttemplates\**\*.gitignore; - $(ProjectRoot)\projecttemplates\**\*.log*; - $(ProjectRoot)\projecttemplates\**\*~; - $(ProjectRoot)\projecttemplates\**\Settings.StyleCop; - $(ProjectRoot)\projecttemplates\**\StyleCop.Cache; - $(ProjectRoot)\projecttemplates\**\*.user; - $(ProjectRoot)\projecttemplates\**\obj\**; - $(ProjectRoot)\projecttemplates\**\bin\**; - $(ProjectRoot)\projecttemplates\**\*.ldf; - $(ProjectRoot)\projecttemplates\**\*.mdf; + $(ProjectRoot)projecttemplates\**\*.sln.cache; + $(ProjectRoot)projecttemplates\**\*.suo; + $(ProjectRoot)projecttemplates\**\*.gitignore; + $(ProjectRoot)projecttemplates\**\*.log*; + $(ProjectRoot)projecttemplates\**\*~; + $(ProjectRoot)projecttemplates\**\Settings.StyleCop; + $(ProjectRoot)projecttemplates\**\StyleCop.Cache; + $(ProjectRoot)projecttemplates\**\*.user; + $(ProjectRoot)projecttemplates\**\obj\**; + $(ProjectRoot)projecttemplates\**\bin\**; + $(ProjectRoot)projecttemplates\**\*.ldf; + $(ProjectRoot)projecttemplates\**\*.mdf; "/> <_ProjectTemplatesTransformSource Include="@(ProjectTemplatesSource)" Condition=" '%(Extension)' == '.cs' @@ -178,17 +178,17 @@ <TopLevelVSProjectTemplates Include="@(VSProjectTemplates)" Condition="'%(RootDir)%(Directory)' == '$(ProjectTemplatesLayoutPath)'" /> <!-- Include the template icon --> - <ProjectTemplatesSource Include="$(ProjectRoot)\doc\logo\dotnetopenid.ico" /> + <ProjectTemplatesSource Include="$(ProjectRoot)doc\logo\dotnetopenid.ico" /> <ProjectTemplatesLayout Include="$(ProjectTemplatesLayoutPath)__TemplateIcon.ico" /> <!-- Add external libraries --> <!-- Include the unified, signed version of the library --> <ProjectTemplateLibraries Include="$(ILMergeOutputAssembly)" /> - <ProjectTemplateLibraries Include="$(ILMergeOutputAssemblyDirectory)\$(ProductName).pdb" /> - <ProjectTemplateLibraries Include="$(OutputPath)\$(ProductName).Contracts.dll" /> + <ProjectTemplateLibraries Include="$(ILMergeOutputAssemblyDirectory)$(ProductName).pdb" /> + <ProjectTemplateLibraries Include="$(OutputPath)$(ProductName).Contracts.dll" /> <!-- ... and log4net --> - <ProjectTemplateLibraries Include="$(ProjectRoot)\lib\log4net.dll" /> - <ProjectTemplateLibraries Include="$(ProjectRoot)\lib\log4net.xml" /> + <ProjectTemplateLibraries Include="$(ProjectRoot)lib\log4net.dll" /> + <ProjectTemplateLibraries Include="$(ProjectRoot)lib\log4net.xml" /> <ProjectTemplateLibrariesTargets Include="@(ProjectTemplateLibraries->'$(ProjectTemplatesLayoutPath)RelyingPartyLogic\lib\%(FileName)%(Extension)')" /> <ProjectTemplatesSource Include="@(ProjectTemplateLibraries)" /> @@ -271,9 +271,9 @@ <!-- Test depends on "Build" rather than "BuildTests" until we can figure out how to build the no-.csproj file test project (to copy binaries to Bin directory). --> <Target Name="Test" DependsOnTargets="Build" - Inputs="$(OutputPath)\$(ProductName).Test.dll" - Outputs='$(OutputPath)\Test-results.xml;$(OutputPath)\Test-output-results.log'> - <Exec Command='"mstest.exe" /testcontainer:"$(OutputPath)\$(ProductName).Test.dll"' /> + Inputs="$(OutputPath)$(ProductName).Test.dll" + Outputs='$(OutputPath)Test-results.xml;$(OutputPath)Test-output-results.log'> + <Exec Command='"mstest.exe" /testcontainer:"$(OutputPath)$(ProductName).Test.dll"' /> </Target> <Target Name="_SetDropProperties"> @@ -281,17 +281,17 @@ where CallTarget is fired do NOT affect those called targets. --> <!-- The rest of these are here so that other DependsOn targets have access to these properties. --> <PropertyGroup> - <DropDirectory>$(DropsRoot)\$(ProductName)-$(BuildVersion)</DropDirectory> + <DropDirectory>$(DropsRoot)$(ProductName)-$(BuildVersion)\</DropDirectory> </PropertyGroup> </Target> <Target Name="DropLayout" DependsOnTargets="GetBuildVersion;_SetDropProperties;BuildUnifiedProduct;ReSignDelaySignedAssemblies;BuildSamples;ProjectTemplates;Documentation"> <PropertyGroup> - <DropBinDirectory>$(DropDirectory)\Bin</DropBinDirectory> - <DropLibDirectory>$(DropDirectory)\Lib</DropLibDirectory> - <DropProjectTemplatesDirectory>$(DropDirectory)\Project Templates</DropProjectTemplatesDirectory> - <DropSamplesDirectory>$(DropDirectory)\Samples</DropSamplesDirectory> - <DropSpecsDirectory>$(DropDirectory)\Specs</DropSpecsDirectory> + <DropBinDirectory>$(DropDirectory)Bin\</DropBinDirectory> + <DropLibDirectory>$(DropDirectory)Lib\</DropLibDirectory> + <DropProjectTemplatesDirectory>$(DropDirectory)Project Templates\</DropProjectTemplatesDirectory> + <DropSamplesDirectory>$(DropDirectory)Samples\</DropSamplesDirectory> + <DropSpecsDirectory>$(DropDirectory)Specs\</DropSpecsDirectory> </PropertyGroup> <ItemGroup> <DropDirectories Include=" @@ -304,53 +304,53 @@ " /> <DropSourceFiles Include=" - $(ProjectRoot)\Doc\$(ProductName).chm; - $(ProjectRoot)\Doc\*.htm*; - $(ProjectRoot)\LICENSE.txt; - $(ProjectRoot)\CONTRIB.txt; + $(ProjectRoot)Doc\$(ProductName).chm; + $(ProjectRoot)Doc\*.htm*; + $(ProjectRoot)LICENSE.txt; + $(ProjectRoot)CONTRIB.txt; " - Exclude="$(ProjectRoot)\Doc\README.*.html;" /> + Exclude="$(ProjectRoot)Doc\README.*.html;" /> <DropBinSourceFiles Include=" - $(ILMergeOutputAssemblyDirectory)\$(ProductName).???; - $(OutputPath)\**\$(ProductName).resources.dll; - $(OutputPath)\$(ProductName).xml; - $(OutputPath)\$(ProductName).Contracts.???; - $(ProjectRoot)\Doc\README.Bin.html; - $(ProjectRoot)\src\$(ProductName)\Configuration\$(ProductName).xsd; + $(ILMergeOutputAssemblyDirectory)$(ProductName).???; + $(OutputPath)**\$(ProductName).resources.dll; + $(OutputPath)$(ProductName).xml; + $(OutputPath)$(ProductName).Contracts.???; + $(ProjectRoot)Doc\README.Bin.html; + $(ProjectRoot)src\$(ProductName)\Configuration\$(ProductName).xsd; " /> <DropLibSourceFiles Include=" - $(ProjectRoot)\Lib\log4net.*; + $(ProjectRoot)Lib\log4net.*; " /> - <DropProjectTemplatesSourceFiles Include="$(ProjectTemplatesLayoutPath)\*.zip" /> - <DropSamplesSourceFiles Include="$(ProjectRoot)\Samples\**" Exclude=" - $(ProjectRoot)\**\obj\**; - $(ProjectRoot)\**\*.sln.cache; - $(ProjectRoot)\**\*.suo; - $(ProjectRoot)\**\*.user; - $(ProjectRoot)\**\*.gitignore; - $(ProjectRoot)\**\*.ldf; - $(ProjectRoot)\**\*.log*; - $(ProjectRoot)\**\*~; - $(ProjectRoot)\**\Debug\**; - $(ProjectRoot)\**\Settings.StyleCop; - $(ProjectRoot)\**\StyleCop.Cache; - $(ProjectRoot)\Samples\**\DotNetOpenAuth.???; - $(ProjectRoot)\Samples\**\log4net.???; - $(ProjectRoot)\Samples\**\PresentationCore.dll; - $(ProjectRoot)\Samples\**\System.Printing.dll; - $(ProjectRoot)\Samples\**\*.refresh_; + <DropProjectTemplatesSourceFiles Include="$(ProjectTemplatesLayoutPath)*.zip" /> + <DropSamplesSourceFiles Include="$(ProjectRoot)Samples\**" Exclude=" + $(ProjectRoot)**\obj\**; + $(ProjectRoot)**\*.sln.cache; + $(ProjectRoot)**\*.suo; + $(ProjectRoot)**\*.user; + $(ProjectRoot)**\*.gitignore; + $(ProjectRoot)**\*.ldf; + $(ProjectRoot)**\*.log*; + $(ProjectRoot)**\*~; + $(ProjectRoot)**\Debug\**; + $(ProjectRoot)**\Settings.StyleCop; + $(ProjectRoot)**\StyleCop.Cache; + $(ProjectRoot)Samples\**\DotNetOpenAuth.???; + $(ProjectRoot)Samples\**\log4net.???; + $(ProjectRoot)Samples\**\PresentationCore.dll; + $(ProjectRoot)Samples\**\System.Printing.dll; + $(ProjectRoot)Samples\**\*.refresh_; " /> <!-- Some .refresh files are only applicable to drop builds, so we rename them from *.refresh_ --> - <DropSamplesRefreshSourceFiles Include="$(ProjectRoot)\Samples\**\*.refresh_" /> - <DropSpecsSourceFiles Include="$(ProjectRoot)\Doc\specs\*.htm*" /> + <DropSamplesRefreshSourceFiles Include="$(ProjectRoot)Samples\**\*.refresh_" /> + <DropSpecsSourceFiles Include="$(ProjectRoot)Doc\specs\*.htm*" /> - <DropFiles Include="@(DropSourceFiles->'$(DropDirectory)\%(RecursiveDir)%(FileName)%(Extension)')"/> - <DropBinFiles Include="@(DropBinSourceFiles->'$(DropBinDirectory)\%(RecursiveDir)%(FileName)%(Extension)')"/> - <DropLibFiles Include="@(DropLibSourceFiles->'$(DropLibDirectory)\%(RecurisveDir)%(FileName)%(Extension)')"/> - <DropProjectTemplatesFiles Include="@(DropProjectTemplatesSourceFiles->'$(DropProjectTemplatesDirectory)\%(FileName)%(Extension)')" /> - <DropSamplesFiles Include="@(DropSamplesSourceFiles->'$(DropSamplesDirectory)\%(RecursiveDir)%(FileName)%(Extension)')"/> - <DropSamplesRefreshFiles Include="@(DropSamplesRefreshSourceFiles->'$(DropSamplesDirectory)\%(RecursiveDir)%(FileName).refresh')"/> - <DropSpecsFiles Include="@(DropSpecsSourceFiles->'$(DropSpecsDirectory)\%(RecursiveDir)%(FileName)%(Extension)')"/> + <DropFiles Include="@(DropSourceFiles->'$(DropDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/> + <DropBinFiles Include="@(DropBinSourceFiles->'$(DropBinDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/> + <DropLibFiles Include="@(DropLibSourceFiles->'$(DropLibDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/> + <DropProjectTemplatesFiles Include="@(DropProjectTemplatesSourceFiles->'$(DropProjectTemplatesDirectory)%(FileName)%(Extension)')" /> + <DropSamplesFiles Include="@(DropSamplesSourceFiles->'$(DropSamplesDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/> + <DropSamplesRefreshFiles Include="@(DropSamplesRefreshSourceFiles->'$(DropSamplesDirectory)%(RecursiveDir)%(FileName).refresh')"/> + <DropSpecsFiles Include="@(DropSpecsSourceFiles->'$(DropSpecsDirectory)%(RecursiveDir)%(FileName)%(Extension)')"/> <AllDropSources Include=" @(DropSourceFiles); @@ -381,7 +381,7 @@ <Purge Directories="$(DropDirectory)" IntendedFiles="@(AllDropTargets)" /> <!-- fix up the samples so that they will compile right out of the drop --> <ItemGroup> - <SampleProjectTargets Include="$(DropSamplesDirectory)\**\*.csproj" /> + <SampleProjectTargets Include="$(DropSamplesDirectory)**\*.csproj" /> </ItemGroup> <ChangeProjectReferenceToAssemblyReference Projects="@(SampleProjectTargets)" ProjectReference="..\..\src\$(ProductName)\$(ProductName).csproj" Reference="..\..\Bin\$(ProductName).dll" /> diff --git a/tools/Documentation.targets b/tools/Documentation.targets index cd73784..e677c49 100644 --- a/tools/Documentation.targets +++ b/tools/Documentation.targets @@ -2,14 +2,14 @@ <PropertyGroup> <NetfxVer>2.0</NetfxVer> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..</ProjectRoot> + <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> <OutputAssembly>DotNetOpenAuth</OutputAssembly> - <OutputPath>$(ProjectRoot)\bin\$(Configuration)</OutputPath> - <DocOutputPath>$(ProjectRoot)\doc</DocOutputPath> - <IntermediatePath>$(ProjectRoot)\obj\$(Configuration)</IntermediatePath> - <DocumentationFile>$(OutputPath)\$(OutputAssembly).xml</DocumentationFile> + <OutputPath>$(ProjectRoot)bin\$(Configuration)\</OutputPath> + <DocOutputPath>$(ProjectRoot)doc\</DocOutputPath> + <IntermediatePath>$(ProjectRoot)obj\$(Configuration)\</IntermediatePath> + <DocumentationFile>$(OutputPath)$(OutputAssembly).xml</DocumentationFile> </PropertyGroup> - <Import Project="$(ProjectRoot)\Tools\sandcastle.targets" /> + <Import Project="$(ProjectRoot)Tools\sandcastle.targets" /> </Project> diff --git a/tools/DotNetOpenAuth.Common.Settings.targets b/tools/DotNetOpenAuth.Common.Settings.targets index 363fd27..34e14f5 100644 --- a/tools/DotNetOpenAuth.Common.Settings.targets +++ b/tools/DotNetOpenAuth.Common.Settings.targets @@ -2,18 +2,18 @@ <PropertyGroup> <ProductName>DotNetOpenAuth</ProductName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)</ProjectRoot> - <DropsRoot>$(ProjectRoot)\drops\$(Configuration)\</DropsRoot> - <OutputPath>$(ProjectRoot)\bin\$(Configuration)\</OutputPath> - <DocOutputPath>$(ProjectRoot)\doc\</DocOutputPath> - <IntermediatePath>$(ProjectRoot)\obj\$(Configuration)\</IntermediatePath> - <ToolsDir>$(ProjectRoot)\tools\</ToolsDir> - <PublicKeyFile>$(ProjectRoot)\src\official-build-key.pub</PublicKeyFile> + <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\</ProjectRoot> + <DropsRoot>$(ProjectRoot)drops\$(Configuration)\</DropsRoot> + <OutputPath>$(ProjectRoot)bin\$(Configuration)\</OutputPath> + <DocOutputPath>$(ProjectRoot)doc\</DocOutputPath> + <IntermediatePath>$(ProjectRoot)obj\$(Configuration)\</IntermediatePath> + <ToolsDir>$(ProjectRoot)tools\</ToolsDir> + <PublicKeyFile>$(ProjectRoot)src\official-build-key.pub</PublicKeyFile> <KeyPairContainer Condition="'$(KeyPairContainer)' == ''">DotNetOpenAuth</KeyPairContainer> <PublicKeyToken>2780CCD10D57B246</PublicKeyToken> </PropertyGroup> - <Import Project="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.targets" /> + <Import Project="$(ProjectRoot)lib\DotNetOpenAuth.BuildTasks.targets" /> <Target Name="InitializeProps"> <CheckAdminRights> diff --git a/tools/DotNetOpenAuth.Versioning.targets b/tools/DotNetOpenAuth.Versioning.targets index 65d212c..0d74d8d 100644 --- a/tools/DotNetOpenAuth.Versioning.targets +++ b/tools/DotNetOpenAuth.Versioning.targets @@ -3,15 +3,15 @@ <!-- Import this .targets file to automatically generate AssemblyVersion attribute according to DotNetOpenAuth convention. --> <PropertyGroup> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..</ProjectRoot> - <VersionCsFile>$(ProjectRoot)\obj\$(Configuration)\$(AssemblyName).Version.cs</VersionCsFile> + <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> + <VersionCsFile>$(ProjectRoot)obj\$(Configuration)\$(AssemblyName).Version.cs</VersionCsFile> </PropertyGroup> - <Import Project="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.targets" /> - <UsingTask AssemblyFile="$(ProjectRoot)\lib\MSBuild.Community.Tasks.dll" TaskName="AssemblyInfo"/> + <Import Project="$(ProjectRoot)lib\DotNetOpenAuth.BuildTasks.targets" /> + <UsingTask AssemblyFile="$(ProjectRoot)lib\MSBuild.Community.Tasks.dll" TaskName="AssemblyInfo"/> <Target Name="GetBuildVersion"> - <GetBuildVersion VersionFile="$(ProjectRoot)\src\version.txt" Condition=" '$(BuildVersion)' == '' "> + <GetBuildVersion VersionFile="$(ProjectRoot)src\version.txt" Condition=" '$(BuildVersion)' == '' "> <Output TaskParameter="Version" PropertyName="BuildVersion" /> </GetBuildVersion> <Message Text="Building version $(BuildVersion)"/> @@ -21,7 +21,7 @@ <PropertyGroup> <NewVersionCsFile>$(VersionCsFile).new</NewVersionCsFile> </PropertyGroup> - <MakeDir Directories="$(ProjectRoot)\obj\$(Configuration)"/> + <MakeDir Directories="$(ProjectRoot)obj\$(Configuration)"/> <AssemblyInfo OutputFile="$(NewVersionCsFile)" CodeLanguage="C#" AssemblyVersion="$(BuildVersion)" /> <!-- Avoid applying the newly generated AssemblyInfo.cs file to the build unless it has changed in order to allow for incremental building. --> diff --git a/tools/JavascriptPacker.targets b/tools/JavascriptPacker.targets index e1a3a8c..2640fd5 100644 --- a/tools/JavascriptPacker.targets +++ b/tools/JavascriptPacker.targets @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5"> <PropertyGroup> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..</ProjectRoot> + <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> </PropertyGroup> - <Import Project="$(ProjectRoot)\lib\DotNetOpenAuth.BuildTasks.targets" /> + <Import Project="$(ProjectRoot)lib\DotNetOpenAuth.BuildTasks.targets" /> <PropertyGroup> <PackJs Condition="'$(PackJs)' == '' and '$(Configuration)' == 'Release'">true</PackJs> diff --git a/tools/Publish.targets b/tools/Publish.targets index 036e751..abdaf39 100644 --- a/tools/Publish.targets +++ b/tools/Publish.targets @@ -26,9 +26,9 @@ <Error Text="The BranchName property must be set." Condition=" '$(BranchName)' == '' " /> <ItemGroup> - <_SampleWebConfigs Include="$(ProjectRoot)\samples\*\web.config" /> + <_SampleWebConfigs Include="$(ProjectRoot)samples\*\web.config" /> <PublishableWebSamples Include="@(_SampleWebConfigs->'%(RootDir)%(Directory)')" /> - <SampleSources Include="$(ProjectRoot)\samples\**\*" /> + <SampleSources Include="$(ProjectRoot)samples\**\*" /> <SampleSources> <PublishedLocation>$(SampleWebRoot)\$(BranchName)\%(RecursiveDir)%(Filename)%(Extension)</PublishedLocation> </SampleSources> @@ -69,7 +69,7 @@ <Target Name="PrepareForPublishDocumentation" DependsOnTargets="Documentation"> <ItemGroup> - <DocSources Include="$(ProjectRoot)\doc\api\**\*" /> + <DocSources Include="$(ProjectRoot)doc\api\**\*" /> <DocTargets Include="@(DocSources->'$(DocWebRoot)\$(BranchName)\%(RecursiveDir)%(Filename)%(Extension)')" /> </ItemGroup> </Target> diff --git a/tools/sandcastle.targets b/tools/sandcastle.targets index afdc77b..d0f9527 100644 --- a/tools/sandcastle.targets +++ b/tools/sandcastle.targets @@ -3,32 +3,34 @@ <PropertyGroup> <PresentationStyle Condition="'$(PresentationStyle)' == ''">vs2005</PresentationStyle> <!-- Environment --> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..</ProjectRoot> + <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildProjectDirectory)\..\..\</ProjectRoot> <Framework>$(WINDIR)\Microsoft.NET\Framework\v2.0.50727</Framework> - <DxRoot>$(ProjectRoot)\tools\Sandcastle</DxRoot> - <ProductionTools>$(DxRoot)\ProductionTools</ProductionTools> - <ProductionTransforms>$(DxRoot)\ProductionTransforms</ProductionTransforms> - <Presentation>$(DxRoot)\Presentation\$(PresentationStyle)</Presentation> + <DxRoot>$(ProjectRoot)tools\Sandcastle\</DxRoot> + <ProductionTools>$(DxRoot)ProductionTools\</ProductionTools> + <ProductionTransforms>$(DxRoot)ProductionTransforms\</ProductionTransforms> + <Presentation>$(DxRoot)Presentation\$(PresentationStyle)\</Presentation> <HHC>$(PROGRAMFILES)\Html Help Workshop\hhc.exe</HHC> - <OutputAssemblyFile>$(OutputPath)\$(OutputAssembly).dll</OutputAssemblyFile> + <OutputAssemblyFile>$(OutputPath)$(OutputAssembly).dll</OutputAssemblyFile> - <DocOutputApiPath>$(DocOutputPath)\api</DocOutputApiPath> - <DocIntermediatePath>$(ProjectRoot)\obj\Doc\$(Configuration)</DocIntermediatePath> - <FxReflectionIntermediatePath>$(ProjectRoot)\obj\Doc\Tmp</FxReflectionIntermediatePath> - <FxReflectionOutputPath>$(ProjectRoot)\obj\Doc\Reflection</FxReflectionOutputPath> - <ChmDir>$(DocIntermediatePath)\chm</ChmDir> + <DocOutputApiPath>$(DocOutputPath)api\</DocOutputApiPath> + <DocIntermediatePath>$(ProjectRoot)obj\Doc\$(Configuration)\</DocIntermediatePath> + <FxReflectionIntermediatePath>$(ProjectRoot)obj\Doc\Tmp\</FxReflectionIntermediatePath> + <FxReflectionOutputPath>$(ProjectRoot)obj\Doc\Reflection\</FxReflectionOutputPath> + <ChmDir>$(DocIntermediatePath)chm</ChmDir> <TocFile>$(ChmDir)\toc.xml</TocFile> - <ChmFile>$(DocOutputPath)\$(OutputAssembly).chm</ChmFile> - <HxtFile>$(DocOutputPath)\$(OutputAssembly).HxT</HxtFile> - <HxsFile>$(DocOutputPath)\$(OutputAssembly).hxs</HxsFile> - <HxcFile>$(DocOutputPath)\$(OutputAssembly).hxc</HxcFile> + <ChmFile>$(DocOutputPath)$(OutputAssembly).chm</ChmFile> + <HxtFile>$(DocOutputPath)$(OutputAssembly).HxT</HxtFile> + <HxsFile>$(DocOutputPath)$(OutputAssembly).hxs</HxsFile> + <HxcFile>$(DocOutputPath)$(OutputAssembly).hxc</HxcFile> <HhkFile>$(chmDir)\$(OutputAssembly).hhk</HhkFile> <HhpFile>$(chmDir)\$(OutputAssembly).hhp</HhpFile> - <ReflectionFile>$(DocIntermediatePath)\reflection.xml</ReflectionFile> - <ManifestFile>$(DocIntermediatePath)\manifest.xml</ManifestFile> - <ReflectionBaseFile>$(DocIntermediatePath)\reflection_base.xml</ReflectionBaseFile> + <ReflectionFile>$(DocIntermediatePath)reflection.xml</ReflectionFile> + <ManifestFile>$(DocIntermediatePath)manifest.xml</ManifestFile> + <ReflectionBaseFile>$(DocIntermediatePath)reflection_base.xml</ReflectionBaseFile> + + <SampleHtmlOutputForUpToDateCheck>$(DocOutputApiPath)html\N_DotNetOpenAuth.htm</SampleHtmlOutputForUpToDateCheck> </PropertyGroup> <ItemGroup> @@ -54,7 +56,7 @@ <SetEnvironmentVariable Name="DxRoot" Value="$(DxRoot)" /> <SetEnvironmentVariable Name="DocumentationFile" Value="$(DocumentationFile)" /> <SetEnvironmentVariable Name="ReflectionXmlFile" Value="$(ReflectionFile)" /> - <SetEnvironmentVariable Name="OutputHtml" Value="$(DocOutputApiPath)\html" /> + <SetEnvironmentVariable Name="OutputHtml" Value="$(DocOutputApiPath)html" /> <SetEnvironmentVariable Name="FxReflectionData" Value="$(FxReflectionOutputPath)" /> </Target> @@ -66,54 +68,54 @@ </CreateItem> <!--<Message Text="%(Assemblies.FullPath)" />--> <Exec ContinueOnError="true" IgnoreExitCode="true" - Command='"$(ProductionTools)\Mrefbuilder.exe" "%(Assemblies.FullPath)" /out:"$(FxReflectionIntermediatePath)\%(Assemblies.FileName).xml"' /> + Command='"$(ProductionTools)Mrefbuilder.exe" "%(Assemblies.FullPath)" /out:"$(FxReflectionIntermediatePath)%(Assemblies.FileName).xml"' /> <Exec Condition="'$(PresentationStyle)' == 'prototype'" ContinueOnError="true" IgnoreExitCode="true" - Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ApplyPrototypeDocModel.xsl" /xsl:"$(ProductionTransforms)\AddGuidFilenames.xsl" "$(FxReflectionIntermediatePath)\%(Assemblies.FileName).xml" /out:"$(FxReflectionOutputPath)\%(Assemblies.FileName).xml" /arg:IncludeAllMembersTopic=false /arg:IncludeInheritedOverloadTopics=true' /> + Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ApplyPrototypeDocModel.xsl" /xsl:"$(ProductionTransforms)AddGuidFilenames.xsl" "$(FxReflectionIntermediatePath)%(Assemblies.FileName).xml" /out:"$(FxReflectionOutputPath)%(Assemblies.FileName).xml" /arg:IncludeAllMembersTopic=false /arg:IncludeInheritedOverloadTopics=true' /> <Exec Condition="'$(PresentationStyle)' == 'vs2005'" ContinueOnError="true" IgnoreExitCode="true" - Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)\AddFriendlyFilenames.xsl" "$(FxReflectionIntermediatePath)\%(Assemblies.FileName).xml" /out:"$(FxReflectionOutputPath)\%(Assemblies.FileName).xml" /arg:IncludeAllMembersTopic=true /arg:IncludeInheritedOverloadTopics=true' /> + Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)AddFriendlyFilenames.xsl" "$(FxReflectionIntermediatePath)%(Assemblies.FileName).xml" /out:"$(FxReflectionOutputPath)%(Assemblies.FileName).xml" /arg:IncludeAllMembersTopic=true /arg:IncludeInheritedOverloadTopics=true' /> <Exec Condition="'$(PresentationStyle)' == 'hana'" ContinueOnError="true" IgnoreExitCode="true" - Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)\AddFriendlyFilenames.xsl" "$(FxReflectionIntermediatePath)\%(Assemblies.FileName).xml" /out:"$(FxReflectionOutputPath)\%(Assemblies.FileName).xml" /arg:IncludeAllMembersTopic=false /arg:IncludeInheritedOverloadTopics=true' /> + Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)AddFriendlyFilenames.xsl" "$(FxReflectionIntermediatePath)%(Assemblies.FileName).xml" /out:"$(FxReflectionOutputPath)%(Assemblies.FileName).xml" /arg:IncludeAllMembersTopic=false /arg:IncludeInheritedOverloadTopics=true' /> </Target> <ItemGroup> - <IconFiles Include="$(Presentation)\icons\**\*.*"/> - <ScriptFiles Include="$(Presentation)\scripts\**\*.*"/> - <StyleFiles Include="$(Presentation)\styles\**\*.*"/> - <IconDestFiles Include="@(IconFiles->'$(DocOutputApiPath)\icons\%(RecursiveDir)%(FileName)%(Extension)')"/> - <ScriptDestFiles Include="@(ScriptFiles->'$(DocOutputApiPath)\scripts\%(RecursiveDir)%(FileName)%(Extension)')"/> - <StyleDestFiles Include="@(StyleFiles->'$(DocOutputApiPath)\styles\%(RecursiveDir)%(FileName)%(Extension)')"/> + <IconFiles Include="$(Presentation)icons\**\*.*"/> + <ScriptFiles Include="$(Presentation)scripts\**\*.*"/> + <StyleFiles Include="$(Presentation)styles\**\*.*"/> + <IconDestFiles Include="@(IconFiles->'$(DocOutputApiPath)icons\%(RecursiveDir)%(FileName)%(Extension)')"/> + <ScriptDestFiles Include="@(ScriptFiles->'$(DocOutputApiPath)scripts\%(RecursiveDir)%(FileName)%(Extension)')"/> + <StyleDestFiles Include="@(StyleFiles->'$(DocOutputApiPath)styles\%(RecursiveDir)%(FileName)%(Extension)')"/> </ItemGroup> <Target Name="Template"> <Copy SourceFiles="@(IconFiles)" DestinationFiles="@(IconDestFiles)" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(ScriptFiles)" DestinationFiles="@(ScriptDestFiles)" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(StyleFiles)" DestinationFiles="@(StyleDestFiles)" SkipUnchangedFiles="true"/> - <MakeDir Directories="$(DocOutputApiPath)\html;$(DocOutputApiPath)\media;$(DocOutputApiPath)\intellisense"/> + <MakeDir Directories="$(DocOutputApiPath)html;$(DocOutputApiPath)media;$(DocOutputApiPath)intellisense"/> </Target> <Target Name="ReflectionBase" Inputs="$(OutputAssemblyFile)" Outputs="$(ReflectionBaseFile)" DependsOnTargets="SetEnvironmentVars;CreateIntermediatePath;ProductionTools"> - <Exec Command='"$(ProductionTools)\MRefBuilder.exe" "$(OutputAssemblyFile)" /out:"$(ReflectionBaseFile)"' /> + <Exec Command='"$(ProductionTools)MRefBuilder.exe" "$(OutputAssemblyFile)" /out:"$(ReflectionBaseFile)"' /> </Target> <Target Name="ReflectionData" DependsOnTargets="FxReflection;ReflectionBase" Inputs="$(ReflectionBaseFile)" Outputs="$(ReflectionFile)"> - <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ApplyPrototypeDocModel.xsl" /xsl:"$(ProductionTransforms)\AddGuidFilenames.xsl" "$(ReflectionBaseFile)" /out:"$(ReflectionFile)"' /> - <Exec Condition="'$(PresentationStyle)' == 'vs2005'" Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)\AddFriendlyFilenames.xsl" "$(ReflectionBaseFile)" /out:"$(ReflectionFile)" /arg:IncludeAllMembersTopic=true /arg:IncludeInheritedOverloadTopics=true' /> - <Exec Condition="'$(PresentationStyle)' == 'hana'" Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)\AddFriendlyFilenames.xsl" "$(ReflectionBaseFile)" /out:"$(ReflectionFile)" /arg:IncludeAllMembersTopic=false /arg:IncludeInheritedOverloadTopics=true' /> + <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ApplyPrototypeDocModel.xsl" /xsl:"$(ProductionTransforms)AddGuidFilenames.xsl" "$(ReflectionBaseFile)" /out:"$(ReflectionFile)"' /> + <Exec Condition="'$(PresentationStyle)' == 'vs2005'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)AddFriendlyFilenames.xsl" "$(ReflectionBaseFile)" /out:"$(ReflectionFile)" /arg:IncludeAllMembersTopic=true /arg:IncludeInheritedOverloadTopics=true' /> + <Exec Condition="'$(PresentationStyle)' == 'hana'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ApplyVSDocModel.xsl" /xsl:"$(ProductionTransforms)AddFriendlyFilenames.xsl" "$(ReflectionBaseFile)" /out:"$(ReflectionFile)" /arg:IncludeAllMembersTopic=false /arg:IncludeInheritedOverloadTopics=true' /> </Target> <Target Name="Manifest" DependsOnTargets="ReflectionData" Inputs="$(ReflectionFile)" Outputs="$(ManifestFile)"> - <Exec Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ReflectionToManifest.xsl" "$(ReflectionFile)" /out:"$(ManifestFile)"' /> + <Exec Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ReflectionToManifest.xsl" "$(ReflectionFile)" /out:"$(ManifestFile)"' /> </Target> <Target Name="Html" Inputs="$(ManifestFile);$(ReflectionFile);$(DocumentationFile)" - Outputs="$(DocOutputApiPath)\html\N_DotNetOpenAuth.htm" + Outputs="$(SampleHtmlOutputForUpToDateCheck)" DependsOnTargets="SetEnvironmentVars;Template;Manifest"> - <Exec Command='"$(ProductionTools)\BuildAssembler.exe" /config:"$(Presentation)\configuration\sandcastle.config" "$(ManifestFile)"' /> + <Exec Command='"$(ProductionTools)BuildAssembler.exe" /config:"$(Presentation)configuration\sandcastle.config" "$(ManifestFile)"' /> </Target> - <Target Name="Chm" Inputs="$(DocOutputApiPath)\html\N_DotNetOpenAuth.htm;$(ReflectionFile)" Outputs="$(ChmFile)" DependsOnTargets="Html"> + <Target Name="Chm" Inputs="$(SampleHtmlOutputForUpToDateCheck);$(ReflectionFile)" Outputs="$(ChmFile)" DependsOnTargets="Html"> <MakeDir Directories="$(chmDir)" Condition="!Exists('$(chmDir)')" /> <MakeDir Directories="$(chmDir)\Html" Condition="!Exists('$(chmDir)\Html')" /> <MakeDir Directories="$(chmDir)\Icons" Condition="!Exists('$(chmDir)\Icons')" /> @@ -121,20 +123,20 @@ <MakeDir Directories="$(chmDir)\Styles" Condition="!Exists('$(chmDir)\Styles')" /> <MakeDir Directories="$(chmDir)\Local" Condition="!Exists('$(chmDir)\Local')" /> - <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\CreatePrototypeToc.xsl" "$(ReflectionFile)" /out:"$(TocFile)"' /> - <Exec Condition="'$(PresentationStyle)' != 'prototype'" Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\CreateVSToc.xsl" "$(ReflectionFile)" /out:"$(TocFile)"' /> + <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)CreatePrototypeToc.xsl" "$(ReflectionFile)" /out:"$(TocFile)"' /> + <Exec Condition="'$(PresentationStyle)' != 'prototype'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)CreateVSToc.xsl" "$(ReflectionFile)" /out:"$(TocFile)"' /> <!--copy directories from hxs --> <Copy SourceFiles="@(IconFiles)" DestinationFolder="$(chmDir)\icons\%(RecursiveDir)" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(ScriptFiles)" DestinationFolder="$(chmDir)\scripts\%(RecursiveDir)" SkipUnchangedFiles="true"/> <Copy SourceFiles="@(StyleFiles)" DestinationFolder="$(chmDir)\styles\%(RecursiveDir)" SkipUnchangedFiles="true"/> - <Exec Condition="Exists('$(chmDir)s\Local')" Command='xcopy.exe "$(chmDir)\Local\*" "$(chmDir)\Local\" /y /r'/> + <Exec Condition="Exists('$(chmDir)\Local')" Command='xcopy.exe "$(chmDir)\Local\*" "$(chmDir)\Local\" /y /r'/> <!-- generate CHM-specific HTML and HH* files --> - <Exec Command='"$(ProductionTools)\ChmBuilder.exe" /project:$(OutputAssembly) /html:"$(DocOutputApiPath)\html" /lcid:1033 /toc:"$(TocFile)" /out:"$(chmDir)"'/> + <Exec Command='"$(ProductionTools)ChmBuilder.exe" /project:$(OutputAssembly) /html:"$(DocOutputApiPath)html" /lcid:1033 /toc:"$(TocFile)" /out:"$(chmDir)"'/> - <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\ReflectionToChmIndex.xsl" "$(ReflectionFile)" /out:"$(HhkFile)"' /> - <Exec Command='"$(ProductionTools)\DBCSFix.exe" /d:$(chmDir) /l:1033'/> + <Exec Condition="'$(PresentationStyle)' == 'prototype'" Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)ReflectionToChmIndex.xsl" "$(ReflectionFile)" /out:"$(HhkFile)"' /> + <Exec Command='"$(ProductionTools)DBCSFix.exe" /d:$(chmDir) /l:1033'/> <Exec Command='"$(HHC)" "$(HhpFile)"' IgnoreExitCode="true" /> @@ -143,16 +145,16 @@ <Target Name="HxS" DependsOnTargets="Build" - Inputs="$(DocOutputPath)\html\*.htm;$(TocFile)" + Inputs="$(DocOutputPath)html\*.htm;$(TocFile)" Outputs="$(HxsFile)"> - <Copy SourceFiles="@(HxsFiles)" DestinationFiles="@(HxsFiles->'$(OutputPath)\%(RecursiveDir)%(FileName)%(Extension)')"/> - <Exec Command='"$(DxRoot)\Presentation\shared\copyhavana.bat" $(OutputAssembly)' /> - <Exec Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\CreateHxc.xsl" "$(TocFile)" /arg:fileNamePrefix="$(OutputAssembly)" /out:"$(HxcFile)"' /> - <Exec Command='"$(ProductionTools)\XslTransform.exe" /xsl:"$(ProductionTransforms)\TocToHxSContents.xsl" "$(TocFile)" /out:"$(HxtFile)"' /> + <Copy SourceFiles="@(HxsFiles)" DestinationFiles="@(HxsFiles->'$(OutputPath)%(RecursiveDir)%(FileName)%(Extension)')"/> + <Exec Command='"$(DxRoot)Presentation\shared\copyhavana.bat" $(OutputAssembly)' /> + <Exec Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)CreateHxc.xsl" "$(TocFile)" /arg:fileNamePrefix="$(OutputAssembly)" /out:"$(HxcFile)"' /> + <Exec Command='"$(ProductionTools)XslTransform.exe" /xsl:"$(ProductionTransforms)TocToHxSContents.xsl" "$(TocFile)" /out:"$(HxtFile)"' /> <Exec Command='hxcomp.exe -p "$(HxcFile)"' IgnoreExitCode="true" /> </Target> <Target Name="ProductionTools"> - <MSBuild Projects="$(DxRoot)\Source\build.proj" /> + <MSBuild Projects="$(DxRoot)Source\build.proj" /> </Target> </Project> |