diff options
| -rw-r--r-- | build.proj | 22 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.automated.targets | 2 |
2 files changed, 21 insertions, 3 deletions
@@ -1,4 +1,4 @@ -<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> +<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" InitialTargets="TouchUpProjectsForDualFrameworks"> <Import Project="EnlistmentInfo.props" /> <Import Project="$(MSBuildProjectDirectory)\tools\DotNetOpenAuth.automated.props"/> <Import Project="$(ProjectRoot)tools\Translation.targets"/> @@ -38,6 +38,24 @@ " /> </ItemGroup> + <Target Name="TouchUpProjectsForDualFrameworks"> + <ItemGroup> + <!-- The point here is to duplicate all projects, once targeting each version of .NET that we support. --> + <NightlyProjects> + <Properties>TargetFrameworkVersion=v3.5</Properties> + </NightlyProjects> + <NightlyProjects Include="@(NightlyProjects)"> + <Properties>TargetFrameworkVersion=v4.0</Properties> + </NightlyProjects> + <ProjectsToClean> + <Properties>TargetFrameworkVersion=v3.5</Properties> + </ProjectsToClean> + <ProjectsToClean Include="@(ProjectsToClean)"> + <Properties>TargetFrameworkVersion=v4.0</Properties> + </ProjectsToClean> + </ItemGroup> + </Target> + <Target Name="BuildTests" DependsOnTargets="SkipVerification"> <MSBuild Projects="$(SolutionPath)" Targets="DotNetOpenAuth_Test;DotNetOpenAuth_TestWeb" BuildInParallel="$(BuildInParallel)" /> </Target> @@ -64,7 +82,7 @@ </Target> <Target Name="Nightly"> - <MSBuild Projects="@(NightlyProjects)" Targets="%(NightlyProjects.Targets)" BuildInParallel="$(BuildInParallel)" /> + <MSBuild Projects="@(NightlyProjects)" Targets="%(NightlyProjects.Targets)" BuildInParallel="$(BuildInParallel)" Properties="%(NightlyProjects.Properties)" /> </Target> <Target Name="Publish"> diff --git a/tools/DotNetOpenAuth.automated.targets b/tools/DotNetOpenAuth.automated.targets index 034fa23..d9a5e45 100644 --- a/tools/DotNetOpenAuth.automated.targets +++ b/tools/DotNetOpenAuth.automated.targets @@ -15,7 +15,7 @@ <Delete Files="@(FilesToClean)" /> <RemoveDir Directories="@(DirectoriesToClean)" /> - <MSBuild Projects="@(ProjectsToClean)" Targets="%(ProjectsToClean.Targets)" BuildInParallel="$(BuildInParallel)" /> + <MSBuild Projects="@(ProjectsToClean)" Targets="%(ProjectsToClean.Targets)" BuildInParallel="$(BuildInParallel)" Properties="%(ProjectsToClean.Properties)" /> </Target> <Target Name="_SetDropProperties" DependsOnTargets="GetBuildVersion"> |