diff options
| -rw-r--r-- | build.proj | 10 | ||||
| -rw-r--r-- | tools/DotNetOpenAuth.props | 2 | ||||
| -rw-r--r-- | vsi/vsi.proj | 2 | ||||
| -rw-r--r-- | vsix/vsix.proj | 9 |
4 files changed, 17 insertions, 6 deletions
@@ -107,7 +107,9 @@ vsi\vsi.proj; vsix\vsix.proj; doc\doc.proj; - " /> + "> + <Output TaskParameter="TargetOutputs" ItemName="DropLayoutDependencies"/> + </MSBuild> <PropertyGroup> <DropBinDirectory>$(DropDirectory)Bin\</DropBinDirectory> <DropLibDirectory>$(DropDirectory)Lib\</DropLibDirectory> @@ -116,6 +118,8 @@ <DropSpecsDirectory>$(DropDirectory)Specs\</DropSpecsDirectory> </PropertyGroup> <ItemGroup> + <ExtensionVsix Include="@(DropLayoutDependencies)" Condition=" '%(DropLayoutDependencies.MSBuildSourceProjectFile)' == '$(ProjectRoot)vsix\vsix.proj' " /> + <ProjectTemplatesVsi Include="@(DropLayoutDependencies)" Condition=" '%(DropLayoutDependencies.MSBuildSourceProjectFile)' == '$(ProjectRoot)vsi\vsi.proj' " /> <DropDirectories Include=" $(DropDirectory); $(DropBinDirectory); @@ -143,8 +147,8 @@ <DropLibSourceFiles Include=" $(ProjectRoot)Lib\log4net.*; " /> - <DropProjectTemplatesSourceFiles Include="$(ProjectTemplatesVsi)" /> - <DropVsixSourceFiles Include="$(ExtensionVsix)" /> + <DropProjectTemplatesSourceFiles Include="@(ProjectTemplatesVsi)" /> + <DropVsixSourceFiles Include="@(ExtensionVsix)" Condition=" '%(ExtensionVsix.IncludeInDrop)' == 'true' " /> <DropSamplesSourceFiles Include="$(ProjectRoot)Samples\**" Exclude=" $(ProjectRoot)**\obj\**; $(ProjectRoot)**\*.sln.cache; diff --git a/tools/DotNetOpenAuth.props b/tools/DotNetOpenAuth.props index 75bfba5..d9b36a0 100644 --- a/tools/DotNetOpenAuth.props +++ b/tools/DotNetOpenAuth.props @@ -4,7 +4,7 @@ <ProductName>DotNetOpenAuth</ProductName> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)' == '' ">v3.5</TargetFrameworkVersion> - <ProjectRoot Condition="'$(ProjectRoot)' == ''">$(MSBuildThisFileDirectory)..\</ProjectRoot> + <ProjectRoot Condition="'$(ProjectRoot)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\'))</ProjectRoot> <DropsRoot>$(ProjectRoot)drops\$(TargetFrameworkVersion)\$(Configuration)\</DropsRoot> <OutputPath>$(ProjectRoot)bin\$(TargetFrameworkVersion)\$(Configuration)\</OutputPath> <DocOutputPath>$(ProjectRoot)doc\</DocOutputPath> diff --git a/vsi/vsi.proj b/vsi/vsi.proj index 6ab1352..04ac615 100644 --- a/vsi/vsi.proj +++ b/vsi/vsi.proj @@ -11,7 +11,7 @@ <ProjectTemplates Include="$(ProjectRoot)projecttemplates\**\*.*proj" /> </ItemGroup> - <Target Name="Build"> + <Target Name="Build" Returns="$(ProjectTemplatesVsi)"> <MSBuild Projects="..\projecttemplates\projecttemplates.proj" Targets="Zip2008" BuildInParallel="$(BuildInParallel)"> <Output TaskParameter="TargetOutputs" ItemName="ProjectTemplate2008ZipSource"/> </MSBuild> diff --git a/vsix/vsix.proj b/vsix/vsix.proj index befcd2b..ffa1995 100644 --- a/vsix/vsix.proj +++ b/vsix/vsix.proj @@ -100,10 +100,17 @@ IntendedFiles="@(VSGalleryVsixTargets)" /> </Target> - <Target Name="Build" DependsOnTargets="Layout;VSGalleryVsixLayout"> + <Target Name="Build" DependsOnTargets="Layout;VSGalleryVsixLayout" Returns="@(GeneratedVsix)"> <PropertyGroup> <ExtensionVsix>$(DropsRoot)$(ProductName) SDK-$(BuildVersion).vsix</ExtensionVsix> </PropertyGroup> + <ItemGroup> + <GeneratedVsix Include="$(ExtensionVsix)"> + <IncludeInDrop>true</IncludeInDrop> + </GeneratedVsix> + <GeneratedVsix Include="%(VSGalleryVsixTargets.VSGalleryVsix)" /> + </ItemGroup> + <Zip Files="@(ExtensionVsixContents)" ZipFileName="$(ExtensionVsix)" |