1 files changed, 21 insertions, 8 deletions

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 883aba42..110ccb28 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -9,6 +9,7 @@
     <NoWarn>$(NoWarn);MSB3026</NoWarn>
 
     <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>
+    <RootFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\))</RootFolder>
     <RootBuildFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</RootBuildFolder>
     <RootPackagesFolder>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\packages\))</RootPackagesFolder>
     <LogsFolder>$(RootBuildFolder)logs\</LogsFolder>
@@ -26,18 +27,30 @@
     <PlatformToolset Condition=" '$(ConfigurationType)' == 'StaticLibrary' ">$(WixNativeSdkLibraryToolset)</PlatformToolset>
     <PlatformToolset Condition=" '$(PlatformToolset)' == '' ">v143</PlatformToolset>
 
-    <Authors>WiX Toolset Team</Authors>
-    <Company>WiX Toolset</Company>
-    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
-    <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
-    <Product>WiX Toolset</Product>
-    <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
-    <PackageIcon>wix.png</PackageIcon>
-
     <NuGetAudit>true</NuGetAudit>
     <NuGetAuditMode>all</NuGetAuditMode>
     <NuGetAuditLevel>low</NuGetAuditLevel>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <Authors Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Authors>
+    <Authors Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset Team</Authors>
+    <Company Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Company>
+    <Company Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset</Company>
+    <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
+
+    <PackageEulaSource>$(RootFolder)OSMFEULA.txt</PackageEulaSource>
+    <PackageLicenseFile>OSMFEULA.txt</PackageLicenseFile>
+    <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
+
+    <Product Condition=" '$(WixOfficialBuild)'!='true' ">WiX Dev Build</Product>
+    <Product Condition=" '$(WixOfficialBuild)'=='true' ">WiX Toolset</Product>
+    <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
+    <PackageIcon>icon.png</PackageIcon>
+    <PackageIconSource Condition=" '$(WixOfficialBuild)'!='true' ">$(MSBuildThisFileDirectory)internal\images\icon.png</PackageIconSource>
+    <PackageIconSource Condition=" '$(WixOfficialBuild)'=='true' ">$(MSBuildThisFileDirectory)internal\images\official\icon.png</PackageIconSource>
+    <PackageTags>WiX MSI install setup</PackageTags>
+  </PropertyGroup>
+
   <Import Project="Directory$(MSBuildProjectExtension).props" Condition=" Exists('Directory$(MSBuildProjectExtension).props') " />
 </Project>