diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | build.proj | 12 | ||||
| -rw-r--r-- | doc/doc.proj | 21 | ||||
| -rw-r--r-- | samples/Samples.proj | 45 |
4 files changed, 39 insertions, 40 deletions
@@ -10,6 +10,7 @@ StyleCop.Cache *~ PrecompiledWeb *.suo +*.log *.cache *.user *.tmp @@ -4,14 +4,16 @@ <Import Project="$(ProjectRoot)tools\Translation.targets"/> <ItemGroup> - <ProjectsInDrop Include=" + <NightlyProjects Include=" samples\tools.proj; tools\drop.proj; " /> - <ProjectsToPublish Include=" + <NightlyProjects Include=" samples\samples.proj; doc\doc.proj; - " /> + "> + <Targets>Zip</Targets> + </NightlyProjects> <ProjectsToClean Include=" $(SolutionPath); @@ -61,11 +63,11 @@ </Target> <Target Name="Nightly"> - <MSBuild Projects="@(ProjectsInDrop)" Targets="%(ProjectsInDrop.Targets)" BuildInParallel="$(BuildInParallel)" /> + <MSBuild Projects="@(NightlyProjects)" Targets="%(NightlyProjects.Targets)" BuildInParallel="$(BuildInParallel)" /> </Target> <Target Name="Publish"> - <MSBuild Projects="@(ProjectsToPublish)" Targets="Publish" BuildInParallel="$(BuildInParallel)" /> + <MSBuild Projects="@(ProjectsToPublish)" Targets="%(ProjectsToPublish.Targets)" BuildInParallel="$(BuildInParallel)" /> </Target> <Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/> diff --git a/doc/doc.proj b/doc/doc.proj index e75565c..ef4a48c 100644 --- a/doc/doc.proj +++ b/doc/doc.proj @@ -22,26 +22,25 @@ </PropertyGroup> </Target> - <Target Name="PrepareForPublish" DependsOnTargets="Prepare;BuildProduct;Html"> + <Target Name="PrepareForPublish" DependsOnTargets="BuildProduct;Html"> + <PropertyGroup> + <DocZip>$(DropDirectoryNoSlash)-htmldoc.zip</DocZip> + </PropertyGroup> + <ItemGroup> <DocSources Include="$(ProjectRoot)doc\api\**\*" /> - <DocTargets Include="@(DocSources->'$(DocWebRoot)\$(BranchName)\%(RecursiveDir)%(Filename)%(Extension)')" /> </ItemGroup> </Target> - <Target Name="Publish" + <Target Name="Zip" DependsOnTargets="PrepareForPublish" Inputs="@(DocSources)" - Outputs="@(DocTargets)"> - <RemoveDir Directories="$(DocWebRoot)\$(BranchName)" /> - <MakeDir Directories="$(DocWebRoot)\$(BranchName)" /> - <Copy SourceFiles="@(DocSources)" DestinationFiles="@(DocTargets)" SkipUnchangedFiles="true" /> + Outputs="$(DocZip)"> + <Zip Files="@(DocSources)" ZipFileName="$(DocZip)" WorkingDirectory="$(ProjectRoot)doc\api\" ZipLevel="$(ZipLevel)" /> </Target> - <Target Name="Unpublish" - DependsOnTargets="DeleteSiteOnIis" - Condition=" '$(DocWebRoot)' != '' "> - </Target> + <Target Name="Publish" + DependsOnTargets="Zip" /> <Target Name="CreateSiteOnIis" DependsOnTargets="Prepare"> <Error Text="The PublishDocsWebSiteName property must be set." Condition=" '$(PublishDocsWebSiteName)' == '' "/> diff --git a/samples/Samples.proj b/samples/Samples.proj index b1f212f..3890f69 100644 --- a/samples/Samples.proj +++ b/samples/Samples.proj @@ -20,11 +20,20 @@ <ProjectsToClean Include="$(SolutionPath)"> <Targets>@(SampleSites->'%(Identity):Clean')</Targets> </ProjectsToClean> + + <_SampleWebConfigs Include="$(ProjectRoot)samples\*\web.config" /> + <PublishableWebSamples Include="@(_SampleWebConfigs->'%(RootDir)%(Directory)')" /> </ItemGroup> <Target Name="Build" DependsOnTargets="SkipVerification"> - <MSBuild Projects="@(SampleProjects)" BuildInParallel="$(BuildInParallel)" /> - <MSBuild Projects="$(SolutionPath)" Targets="@(SampleSites)" BuildInParallel="$(BuildInParallel)" /> + <ItemGroup> + <SampleProjectsToBuild Include="@(SampleProjects)" /> + <SampleProjectsToBuild Include="$(SolutionPath)"> + <Targets>%(SampleSites.Identity)</Targets> + </SampleProjectsToBuild> + </ItemGroup> + + <MSBuild Projects="@(SampleProjectsToBuild)" Targets="%(SampleProjectsToBuild.Targets)" BuildInParallel="$(BuildInParallel)" /> </Target> <Target Name="Prepare"> @@ -33,10 +42,6 @@ <PropertyGroup> <PublishSamplesWebSiteVirtualPath>/$(BranchName)</PublishSamplesWebSiteVirtualPath> </PropertyGroup> - <ItemGroup> - <_SampleWebConfigs Include="$(ProjectRoot)samples\*\web.config" /> - <PublishableWebSamples Include="@(_SampleWebConfigs->'%(RootDir)%(Directory)')" /> - </ItemGroup> <!-- Trim the trailing slash on the web sample paths so we can just get the leaf directory name. --> <Trim @@ -51,12 +56,13 @@ </ItemGroup> </Target> - <Target Name="PrepareForPublish" DependsOnTargets="Prepare;Build"> + <Target Name="PrepareForPublish" DependsOnTargets="Build"> + <PropertyGroup> + <SamplesZip>$(DropDirectoryNoSlash)-samples.zip</SamplesZip> + </PropertyGroup> + <ItemGroup> <SampleSources Include="$(ProjectRoot)samples\**\*" /> - <SampleSources> - <PublishedLocation>$(SampleWebRoot)\$(BranchName)\%(RecursiveDir)%(Filename)%(Extension)</PublishedLocation> - </SampleSources> </ItemGroup> <FilterItems @@ -64,26 +70,17 @@ StartsWithAny="@(PublishableWebSamples)"> <Output TaskParameter="FilteredItems" ItemName="PublishableWebSampleSources" /> </FilterItems> - - <ItemGroup> - <PublishableWebSampleTargets Include="@(PublishableWebSampleSources->'%(PublishedLocation)')" /> - </ItemGroup> </Target> - <Target Name="Publish" + <Target Name="Zip" DependsOnTargets="PrepareForPublish" Inputs="@(PublishableWebSampleSources)" - Outputs="@(PublishableWebSampleTargets)" - Condition=" '$(SampleWebRoot)' != '' "> - <RemoveDir Directories="$(SampleWebRoot)\$(BranchName)" /> - <MakeDir Directories="$(SampleWebRoot)\$(BranchName)" /> - <Copy SourceFiles="@(PublishableWebSampleSources)" DestinationFiles="@(PublishableWebSampleTargets)" SkipUnchangedFiles="true" /> + Outputs="$(SamplesZip)"> + <Zip Files="@(PublishableWebSampleSources)" ZipFileName="$(SamplesZip)" WorkingDirectory="$(ProjectRoot)samples\" ZipLevel="$(ZipLevel)" /> </Target> - <Target Name="Unpublish" - DependsOnTargets="DeleteSitesOnIis" - Condition=" '$(SampleWebRoot)' != '' "> - </Target> + <Target Name="Publish" + DependsOnTargets="Zip" /> <Target Name="CreateSitesOnIis" DependsOnTargets="Prepare"> <Error Text="The PublishSamplesWebSiteName property must be set." Condition=" '$(PublishSamplesWebSiteName)' == '' "/> |