diff options
| -rw-r--r-- | build.proj | 28 | ||||
| -rw-r--r-- | tools/drop.proj | 15 |
2 files changed, 29 insertions, 14 deletions
@@ -11,13 +11,14 @@ "> <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); @@ -25,10 +26,12 @@ 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"/> diff --git a/tools/drop.proj b/tools/drop.proj index a29c2df..87ba5cb 100644 --- a/tools/drop.proj +++ b/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> |