VSIX files now generated as well.

3 files changed, 43 insertions, 39 deletions

diff --git a/projecttemplates/projecttemplates.proj b/projecttemplates/projecttemplates.proj
index b04eaef..d4d3a56 100644
--- a/projecttemplates/projecttemplates.proj
+++ b/projecttemplates/projecttemplates.proj
@@ -1,4 +1,4 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<Import Project="$(MSBuildProjectDirectory)\..\tools\DotNetOpenAuth.automated.props"/>
 	<Import Project="ProjectTemplates.props"/>
 
@@ -155,7 +155,7 @@
 					 IntendedFiles="@(ProjectTemplateIntendedFiles)" />
 	</Target>
 
-	<Target Name="Zip" DependsOnTargets="Layout">
+	<Target Name="Zip" DependsOnTargets="Layout" Returns="%(VS2010ProjectTemplateContents.ZipFile)">
 		<DiscoverProjectTemplates TopLevelTemplates="@(TopLevelVS2010ProjectTemplates)">
 			<Output TaskParameter="ProjectTemplates" ItemName="SubVS2010Templates" />
 			<Output TaskParameter="ProjectTemplateContents" ItemName="VS2010TemplateItemContents" />
@@ -251,5 +251,7 @@
 			/>
 	</Target>
 
+	<Target Name="Build" DependsOnTargets="Zip;Zip2008" />
+
 	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/>
 </Project>
\ No newline at end of file
diff --git a/vsi/vsi.proj b/vsi/vsi.proj
index 8dcf95b..6ab1352 100644
--- a/vsi/vsi.proj
+++ b/vsi/vsi.proj
@@ -13,7 +13,7 @@
 
 	<Target Name="Build">
 		<MSBuild Projects="..\projecttemplates\projecttemplates.proj" Targets="Zip2008" BuildInParallel="$(BuildInParallel)">
-			<Output TaskParameter="TargetOutputs" ItemName="ProjectTemplateZipSource"/>
+			<Output TaskParameter="TargetOutputs" ItemName="ProjectTemplate2008ZipSource"/>
 		</MSBuild>
 
 		<PropertyGroup>
@@ -32,14 +32,14 @@
 																	@(VsiTransformLayout);
 																	" />
 
-			<ProjectTemplateZipSource>
+			<ProjectTemplate2008ZipSource>
 				<HardLink>true</HardLink>
-			</ProjectTemplateZipSource>
-			<ProjectTemplateZipTargets Include="@(ProjectTemplateZipSource->'$(ProjectTemplatesVsiDirectory)%(FileName)%(Extension)')" />
+			</ProjectTemplate2008ZipSource>
+			<ProjectTemplate2008ZipTargets Include="@(ProjectTemplate2008ZipSource->'$(ProjectTemplatesVsiDirectory)%(FileName)%(Extension)')" />
 		</ItemGroup>
 
 		<CopyWithTokenSubstitution SourceFiles="@(VsiTransformSource)" DestinationFiles="@(VsiTransformLayout)" />
-		<HardLinkCopy SourceFiles="@(ProjectTemplateZipSource)" DestinationFiles="@(ProjectTemplateZipTargets)" />
+		<HardLinkCopy SourceFiles="@(ProjectTemplate2008ZipSource)" DestinationFiles="@(ProjectTemplate2008ZipTargets)" />
 
 		<Zip
 			Files="@(ProjectTemplateVsiContents)"
diff --git a/vsix/vsix.proj b/vsix/vsix.proj
index 9a8eaa0..befcd2b 100644
--- a/vsix/vsix.proj
+++ b/vsix/vsix.proj
@@ -3,72 +3,78 @@
 	<Import Project="..\projecttemplates\ProjectTemplates.props"/>
 
 	<PropertyGroup>
-		<ExtensionVsixLayoutDirectory>$(IntermediatePath)Vsix\</ExtensionVsixLayoutDirectory>
+		<ExtensionVsixLayoutDirectory>$(IntermediatePath)vsix\</ExtensionVsixLayoutDirectory>
 		<ProjectTemplateSubdirectory>$(ExtensionVsixLayoutDirectory)PT\CSharp\Web\</ProjectTemplateSubdirectory>
 	</PropertyGroup>
 
-	<Target Name="VsixManifestLayout">
+	<Target Name="Layout">
+		<MSBuild Projects="..\projecttemplates\projecttemplates.proj" Targets="Zip" BuildInParallel="$(BuildInParallel)">
+			<Output TaskParameter="TargetOutputs" ItemName="ProjectTemplateZipSource"/>
+		</MSBuild>
+
 		<ItemGroup>
-			<ProjectTemplates2010TransformSource Include="
+			<ProjectTemplateZipSource>
+				<HardLink>true</HardLink>
+			</ProjectTemplateZipSource>
+			<ProjectTemplateZipTargets Include="@(ProjectTemplateZipSource->'$(ProjectTemplateSubdirectory)%(FileName)%(Extension)')" />
+
+			<ExtensionVsixTransformSource Include="
 																					 $(ProjectRoot)vsix\extension.vsixmanifest;
 																					 $(ProjectRoot)LICENSE.txt;
 																					 ">
 				<BeforeTokens>$version$</BeforeTokens>
 				<AfterTokens>$(BuildVersion)</AfterTokens>
 				<SkipUnchangedFiles>false</SkipUnchangedFiles>
-			</ProjectTemplates2010TransformSource>
-			<ProjectTemplates2010TransformLayout Include="@(ProjectTemplates2010TransformSource->'$(ExtensionVsixLayoutDirectory)%(RecursiveDir)%(FileName)%(Extension)')" />
-		</ItemGroup>
-		<CopyWithTokenSubstitution SourceFiles="@(ProjectTemplates2010TransformSource)" DestinationFiles="@(ProjectTemplates2010TransformLayout)" />
-	</Target>
-
-	<Target Name="VsixLayout" DependsOnTargets="VsixManifestLayout">
-		<MSBuild Projects="..\projecttemplates\projecttemplates.proj" Targets="Zip" BuildInParallel="$(BuildInParallel)" />
+			</ExtensionVsixTransformSource>
+			<ExtensionVsixTransformLayout Include="@(ExtensionVsixTransformSource->'$(ExtensionVsixLayoutDirectory)%(RecursiveDir)%(FileName)%(Extension)')" />
 
-		<ItemGroup>
 			<ExtensionVsixSources Include="
 														$(ProjectRoot)vsix\*;
 														" Exclude="
 														$(ProjectRoot)vsix\extension.vsixmanifest;
+														$(ProjectRoot)vsix\$(MSBuildThisFile);
 														">
 				<SkipUnchangedFiles>true</SkipUnchangedFiles>
 			</ExtensionVsixSources>
-
 			<ExtensionVsixTargets Include="@(ExtensionVsixSources->'$(ExtensionVsixLayoutDirectory)%(FileName)%(Extension)')" />
 
 			<ExtensionVsixContents Include="
 														 @(ExtensionVsixTargets);
-														 @(ProjectTemplates2010TransformLayout);
+														 @(ExtensionVsixTransformLayout);
+														 @(ProjectTemplateZipTargets);
 														 "/>
 		</ItemGroup>
 
+		<CopyWithTokenSubstitution SourceFiles="@(ExtensionVsixTransformSource)" DestinationFiles="@(ExtensionVsixTransformLayout)" />
 		<Copy SourceFiles="@(ExtensionVsixSources)" DestinationFiles="@(ExtensionVsixTargets)" SkipUnchangedFiles="true" />
+		<HardLinkCopy SourceFiles="@(ProjectTemplateZipSource)" DestinationFiles="@(ProjectTemplateZipTargets)" />
 		<Purge Directories="$(ExtensionVsixLayoutDirectory)" IntendedFiles="@(ExtensionVsixContents)" />
+	</Target>
 
+	<Target Name="VSGalleryVsixLayout" DependsOnTargets="Layout">
 		<!-- Build individual VSIX files for each project template for the Visual Studio Gallery,
 		     which only allows one project template per VSIX. -->
 		<ItemGroup>
-			<VSGalleryProjectTemplates Include="$(ProjectTemplateSubdirectory)*.zip" />
-			<VSGalleryVsixRawSources Include="$(ExtensionVsixLayoutDirectory)**"
-														Exclude="$(ProjectTemplateSubdirectory)*.zip;$(ExtensionVsixLayoutDirectory)*.vsixmanifest">
-				<VSGalleryVsix>$(DropsRoot)$(ProductName) %(VSGalleryProjectTemplates.FileName)-$(BuildVersion).vsix</VSGalleryVsix>
-				<TopLevelTemplate>%(VSGalleryProjectTemplates.FileName)</TopLevelTemplate>
+			<VSGalleryVsixRawSources Include="$(ExtensionVsixLayoutDirectory)*"
+															 Exclude="$(ExtensionVsixLayoutDirectory)*.vsixmanifest">
+				<VSGalleryVsix>$(DropsRoot)$(ProductName) %(ProjectTemplateZipTargets.FileName)-$(BuildVersion).vsix</VSGalleryVsix>
+				<TopLevelTemplate>%(ProjectTemplateZipTargets.FileName)</TopLevelTemplate>
 			</VSGalleryVsixRawSources>
 			<VSGalleryVsixSources Include="@(VSGalleryVsixRawSources)">
 				<TargetPath>$(IntermediatePath)%(TopLevelTemplate).vsix\%(FileName)%(Extension)</TargetPath>
 			</VSGalleryVsixSources>
 
-			<VSGalleryVsixZipSources Include="$(ExtensionVsixLayoutDirectory)**\*.zip"/>
+			<VSGalleryVsixZipSources Include="$(ExtensionVsixLayoutDirectory)**\*.zip" />
 			<VSGalleryVsixSources Include="@(VSGalleryVsixZipSources)">
 				<TopLevelTemplate>%(FileName)</TopLevelTemplate>
 				<VSGalleryVsix>$(DropsRoot)$(ProductName) %(FileName)-$(BuildVersion).vsix</VSGalleryVsix>
 				<TargetPath>$(IntermediatePath)%(FileName).vsix\%(RecursiveDir)%(FileName)%(Extension)</TargetPath>
 			</VSGalleryVsixSources>
 
-			<VSGalleryVsixSources Include="@(VSGalleryProjectTemplates->'$(ProjectRoot)projecttemplates\%(FileName).vsixmanifest')">
-				<VSGalleryVsix>$(DropsRoot)$(ProductName) %(VSGalleryProjectTemplates.FileName)-$(BuildVersion).vsix</VSGalleryVsix>
-				<TopLevelTemplate>%(VSGalleryProjectTemplates.FileName)</TopLevelTemplate>
-				<TargetPath>$(IntermediatePath)%(VSGalleryProjectTemplates.FileName).vsix\extension.vsixmanifest</TargetPath>
+			<VSGalleryVsixSources Include="@(ProjectTemplateZipTargets->'$(ProjectRoot)projecttemplates\%(FileName).vsixmanifest')">
+				<VSGalleryVsix>$(DropsRoot)$(ProductName) %(ProjectTemplateZipTargets.FileName)-$(BuildVersion).vsix</VSGalleryVsix>
+				<TopLevelTemplate>%(ProjectTemplateZipTargets.FileName)</TopLevelTemplate>
+				<TargetPath>$(IntermediatePath)%(ProjectTemplateZipTargets.FileName).vsix\extension.vsixmanifest</TargetPath>
 				<Transform>true</Transform>
 				<BeforeTokens>$version$</BeforeTokens>
 				<AfterTokens>$(BuildVersion)</AfterTokens>
@@ -78,8 +84,9 @@
 			<VSGalleryVsixTargets Include="@(VSGalleryVsixSources->'%(TargetPath)')">
 				<WorkingDirectory>$(IntermediatePath)%(TopLevelTemplate).vsix</WorkingDirectory>
 			</VSGalleryVsixTargets>
-			<VSGalleryVsixPathsToPurge Include="@(VSGalleryProjectTemplates->'$(IntermediatePath)%(FileName).vsix')"/>
+			<VSGalleryVsixPathsToPurge Include="@(ProjectTemplateZipTargets->'$(IntermediatePath)%(FileName).vsix')"/>
 		</ItemGroup>
+
 		<HardLinkCopy
 			SourceFiles="@(VSGalleryVsixSources)"
 			DestinationFiles="%(VSGalleryVsixSources.TargetPath)"
@@ -93,7 +100,7 @@
 			IntendedFiles="@(VSGalleryVsixTargets)" />
 	</Target>
 
-	<Target Name="vsix" DependsOnTargets="VsixLayout">
+	<Target Name="Build" DependsOnTargets="Layout;VSGalleryVsixLayout">
 		<PropertyGroup>
 			<ExtensionVsix>$(DropsRoot)$(ProductName) SDK-$(BuildVersion).vsix</ExtensionVsix>
 		</PropertyGroup>
@@ -112,10 +119,5 @@
 			/>
 	</Target>
 
-	<Target Name="Build" DependsOnTargets="vsix">
-		
-	</Target>
-
-	<Import Project="$(ProjectRoot)projecttemplates\projecttemplates.targets"/>
-	<Import Project="$(ProjectRoot)DotNetOpenAuth.automated.targets"/>
+	<Import Project="$(ProjectRoot)tools\DotNetOpenAuth.automated.targets"/>
 </Project>
\ No newline at end of file