Permalink
Browse files

More fixing up docs so that they build correctly.

  • Loading branch information...
1 parent 8243e92 commit cdc9764701baaa1640d7d098e8f8c8c7f7ae9de8 @AArnott AArnott committed Apr 16, 2012
Showing with 29 additions and 14 deletions.
  1. +18 −10 build.proj
  2. +11 −4 tools/drop.proj
View
28 build.proj
@@ -11,24 +11,27 @@
">
<Properties>TargetFrameworkVersion=v4.0</Properties>
</NightlyProjects>
- <NightlyProjects Include="
- doc\doc.proj;
- samples\samples.proj;
- ">
+ <NightlyProjects Include="samples\samples.proj">
<Targets>DeployableArchive</Targets>
<Properties>TargetFrameworkVersion=v4.0</Properties>
</NightlyProjects>
+ <NightlyProjects Include="doc\doc.proj">
+ <Targets>DeployableArchive</Targets>
+ <Properties>TargetFrameworkVersion=v3.5</Properties>
+ </NightlyProjects>
<ProjectsToClean Include="
$(SolutionPath);
projecttemplates\projecttemplates.proj;
vsi\vsi.proj;
vsix\vsix.proj;
samples\samples.proj;
- doc\doc.proj;
">
<Properties>TargetFrameworkVersion=v4.0</Properties>
</ProjectsToClean>
+ <ProjectsToClean Include="doc\doc.proj">
+ <Properties>TargetFrameworkVersion=v3.5</Properties>
+ </ProjectsToClean>
<DirectoriesToClean Include="
$(ProjectRoot)bin;
@@ -47,11 +50,13 @@
<TestAssemblies Include="$(OutputPath)$(ProductName).Test.dll" Condition=" '$(ClrVersion)' == '2' " />
<TestAssemblies Include="$(OutputPath)$(ProductName).AspNet.Test.dll" Condition=" '$(ClrVersion)' == '4' " />
- <ProjectsToPublish Include="
- doc\doc.proj;
- samples\samples.proj;
- ">
+ <ProjectsToPublish Include="doc\doc.proj">
<Targets>Publish</Targets>
+ <Properties>TargetFrameworkVersion=v3.5</Properties>
+ </ProjectsToPublish>
+ <ProjectsToPublish Include="samples\samples.proj">
+ <Targets>Publish</Targets>
+ <Properties>TargetFrameworkVersion=v4.0</Properties>
</ProjectsToPublish>
</ItemGroup>
@@ -85,7 +90,10 @@
</Target>
<Target Name="Publish">
- <MSBuild Projects="@(ProjectsToPublish)" Targets="%(ProjectsToPublish.Targets)" BuildInParallel="$(BuildInParallel)" />
+ <MSBuild Projects="@(ProjectsToPublish)"
+ Targets="%(ProjectsToPublish.Targets)"
+ Properties="%(ProjectsToPublish.Properties)"
+ BuildInParallel="$(BuildInParallel)" />
</Target>
<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/>
View
15 tools/drop.proj
@@ -31,11 +31,18 @@
<ProjectsToBuild Include="
$(ProjectRoot)vsix\vsix.proj;
$(ProjectRoot)samples\samples.proj;
- $(ProjectRoot)doc\doc.proj;
- " />
+ ">
+ <Properties>TargetFrameworkVersion=v4.0</Properties>
+ </ProjectsToBuild>
+
+ <!-- Sandcastle doesn't seem to be able to handle .NET 4.0 dependencies right now. -->
+ <ProjectsToBuild Include="$(ProjectRoot)doc\doc.proj">
+ <Properties>TargetFrameworkVersion=v3.5</Properties>
+ </ProjectsToBuild>
</ItemGroup>
- <MSBuild BuildInParallel="$(BuildInParallel)"
- Projects="@(ProjectsToBuild)">
+ <MSBuild Projects="@(ProjectsToBuild)"
+ Properties="%(ProjectsToBuild.Properties)"
+ BuildInParallel="$(BuildInParallel)">
<Output TaskParameter="TargetOutputs" ItemName="DropLayoutDependencies"/>
</MSBuild>
<PropertyGroup>

0 comments on commit cdc9764

Please sign in to comment.