diff options
| -rw-r--r-- | build.proj | 29 | ||||
| -rw-r--r-- | samples/Samples.proj | 5 | ||||
| -rw-r--r-- | src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln | 2 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.automated.targets | 7 |
4 files changed, 26 insertions, 17 deletions
@@ -6,31 +6,25 @@ <ItemGroup> <ProjectsToClean Include=" $(SolutionPath); + projecttemplates\projecttemplates.proj; vsi\vsi.proj; vsix\vsix.proj; + samples\samples.proj; + doc\doc.proj; "/> - </ItemGroup> - <Target Name="Clean" DependsOnTargets="CleanDocumentation;UnpublishSamples;UnpublishDocumentation"> - <MSBuild Projects="@(ProjectsToClean)" Targets="Clean" BuildInParallel="$(BuildInParallel)" /> - <ItemGroup> - <DirtyDirectories Include=" + <DirectoriesToClean Include=" $(ProjectRoot)bin; $(ProjectRoot)**\obj; $(DropsRoot); $(ProjectRoot)src\PrecompiledWeb; " /> - <DirtyDirectories Include="@(SampleDirectories->'%(FullPath)\bin')" /> - <DirtyDirectories Include="@(SampleDirectories->'%(FullPath)\obj')" /> - <DirtyFiles Include=" - $(ProjectRoot)**\*~; - $(ProjectRoot)**\*.log*; - $(ProjectRoot)doc\$(ProductName).chm; - " /> - </ItemGroup> - <Delete Files="@(DirtyFiles)" /> - <RemoveDir Directories="@(DirtyDirectories)" /> - </Target> + <FilesToClean Include=" + $(ProjectRoot)**\*~; + $(ProjectRoot)**\*.log*; + $(ProjectRoot)doc\$(ProductName).chm; + " /> + </ItemGroup> <Target Name="BuildTests" DependsOnTargets="SkipVerification"> <MSBuild Projects="$(SolutionPath)" Targets="DotNetOpenAuth_Test;DotNetOpenAuth_TestWeb" BuildInParallel="$(BuildInParallel)" /> @@ -168,6 +162,7 @@ $(ProjectRoot)Samples\**\PresentationCore.dll; $(ProjectRoot)Samples\**\System.Printing.dll; $(ProjectRoot)Samples\**\*.refresh_; + $(ProjectRoot)Samples\Samples.proj; " /> <!-- Some .refresh files are only applicable to drop builds, so we rename them from *.refresh_ --> <DropSamplesRefreshSourceFiles Include="$(ProjectRoot)Samples\**\*.refresh_" /> @@ -221,7 +216,7 @@ RemoveImportsStartingWith="%24(ProjectRoot)tools\" AddReferences="Microsoft.Contracts"/> <ChangeProjectReferenceToAssemblyReference Projects="@(SampleProjectTargets)" - ProjectReference="..\..\src\$(ProductName)\$(ProductName).csproj" Reference="..\..\Bin\$(ProductName).dll" /> + ProjectReferences="..\..\src\$(ProductName)\$(ProductName).csproj" References="..\..\Bin\$(ProductName).dll" /> <DowngradeProjects Projects="@(SampleProjectTargets);@(SampleSolutionTargets)" DowngradeMvc2ToMvc1="true" /> </Target> diff --git a/samples/Samples.proj b/samples/Samples.proj index 9290837..b8fe558 100644 --- a/samples/Samples.proj +++ b/samples/Samples.proj @@ -5,6 +5,11 @@ <ItemGroup> <SampleProjects Include="**\*.csproj;**\*.vbproj" /> <SampleSites Include="OAuthConsumer;OAuthServiceProvider;InfoCardRelyingParty" /> + + <ProjectsToClean Include="@(SampleProjects)" /> + <ProjectsToClean Include="$(SolutionPath)"> + <Targets>@(SampleSites->'%(Identity):Clean')</Targets> + </ProjectsToClean> </ItemGroup> <Target Name="Build" DependsOnTargets="SkipVerification"> diff --git a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln index 1f2cee8..b91c8ef 100644 --- a/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln +++ b/src/DotNetOpenAuth.BuildTasks/DotNetOpenAuth.BuildTasks.sln @@ -4,6 +4,7 @@ Microsoft Visual Studio Solution File, Format Version 11.00 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{ABBE14A3-0404-4123-9093-E598C3DD3E9B}" ProjectSection(SolutionItems) = preProject ..\..\build.proj = ..\..\build.proj + ..\..\doc\doc.proj = ..\..\doc\doc.proj ..\..\tools\DotNetOpenAuth.automated.props = ..\..\tools\DotNetOpenAuth.automated.props ..\..\tools\DotNetOpenAuth.automated.targets = ..\..\tools\DotNetOpenAuth.automated.targets ..\..\lib\DotNetOpenAuth.BuildTasks.targets = ..\..\lib\DotNetOpenAuth.BuildTasks.targets @@ -12,6 +13,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution ..\..\tools\DotNetOpenAuth.targets = ..\..\tools\DotNetOpenAuth.targets ..\..\tools\DotNetOpenAuth.Versioning.targets = ..\..\tools\DotNetOpenAuth.Versioning.targets ..\..\projecttemplates\projecttemplates.proj = ..\..\projecttemplates\projecttemplates.proj + ..\..\samples\Samples.proj = ..\..\samples\Samples.proj ..\..\vsi\vsi.proj = ..\..\vsi\vsi.proj ..\..\vsix\vsix.proj = ..\..\vsix\vsix.proj EndProjectSection diff --git a/tools/DotNetOpenAuth.automated.targets b/tools/DotNetOpenAuth.automated.targets index 9193d30..5333b34 100644 --- a/tools/DotNetOpenAuth.automated.targets +++ b/tools/DotNetOpenAuth.automated.targets @@ -7,8 +7,15 @@ <Target Name="Rebuild" DependsOnTargets="Clean;Build"/> <Target Name="Clean"> + <ItemGroup> + <ProjectsToClean> + <Targets Condition=" '%(ProjectsToClean.Targets)' == '' ">Clean</Targets> + </ProjectsToClean> + </ItemGroup> + <Delete Files="@(FilesToClean)" /> <RemoveDir Directories="@(DirectoriesToClean)" /> + <MSBuild Projects="@(ProjectsToClean)" Targets="%(ProjectsToClean.Targets)" BuildInParallel="$(BuildInParallel)" /> </Target> <Target Name="_SetDropProperties" DependsOnTargets="GetBuildVersion"> |