1 files changed, 9 insertions, 2 deletions

diff --git a/src/Directory.Build.targets b/src/Directory.Build.targets
index 91aadf5b..7083da38 100644
--- a/src/Directory.Build.targets
+++ b/src/Directory.Build.targets
@@ -32,7 +32,8 @@
   <PropertyGroup>
     <GenerateNuspecDependsOn>
       $(GenerateNuspecDependsOn);
-      __SetNuspecProperties
+      __SetNuspecProperties;
+      VerifyOfficialBuild
     </GenerateNuspecDependsOn>
   </PropertyGroup>
 
@@ -46,7 +47,8 @@
       <NuspecProperties>$(NuspecProperties);Id=$(PackageId);Version=$(PackageVersion);MajorVersion=$(SomeVerInfoMajor);NextMajorVersion=$(SomeVerInfoNextMajor);Authors=$(Authors);Configuration=$(Configuration)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);Copyright=$(Copyright);Description=$(Description);Title=$(Title)</NuspecProperties>
       <NuspecProperties>$(NuspecProperties);RepositoryType=$(RepositoryType);RepositoryCommit=$(RepositoryCommit);RepositoryUrl=$(RepositoryUrl)</NuspecProperties>
-      <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);PackageTags=$(PackageTags)</NuspecProperties>
+      <NuspecProperties>$(NuspecProperties);ProjectUrl=$(ProjectUrl);ProjectFolder=$(MSBuildProjectDirectory);RootFolder=$(RootFolder);EulaTxt=$(PackageEulaSource);IconPng=$(PackageIconSource)</NuspecProperties>
     </PropertyGroup>
   </Target>
 
@@ -97,6 +99,11 @@
           WorkingDirectory="$(MSBuildProjectDirectory)" EchoOff="true" />
   </Target>
 
+  <Target Name="VerifyOfficialBuild" Condition=" '$(WixOfficialBuild)'=='true' ">
+    <Error Text="Official builds are only supported in the WiX Toolset repo. You are welcome to create your own builds but please do not use the official WiX Toolset name or logo."
+           Condition=" '$(RepoOrg)'!='wixtoolset' " />
+  </Target>
+
   <Import Project="Directory$(MSBuildProjectExtension).targets" Condition=" Exists('Directory$(MSBuildProjectExtension).targets') " />
   <Import Project="Custom.Build.targets" Condition=" Exists('Custom.Build.targets') " />
 </Project>