WiX Toolset v4-preview.0v4.0.0-preview.0

15 files changed, 38 insertions, 19 deletions

diff --git a/README.md b/README.md
index dab171c6..9cc049c6 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,8 @@
-<img src="https://github.com/wixtoolset/Home/raw/master/imgs/wix-white-bg.png" alt="WiX Toolset" height="128" />
+![WiX Toolset](https://github.com/wixtoolset/Home/raw/master/imgs/wix-white-bg.png)
+
+https://img.shields.io/nuget/vpre/wix
+https://img.shields.io/nuget/dt/wix
+https://img.shields.io/appveyor/build/wixtoolset/wix4
 
 # WiX Toolset v4
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 983b4d66..6776c6fe 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,6 +22,7 @@
     <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
     <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
     <Product>WiX Toolset</Product>
+    <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
 
     <GitThisAssembly>false</GitThisAssembly>
     <GitVersionFile>version.txt</GitVersionFile>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
index f74baa9a..c0f17975 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
@@ -5,8 +5,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>WixToolset.Bal</RootNamespace>
-    <Description>WiX Toolset Bal Extension</Description>
-    <Title>WiX Toolset Bal Extension</Title>
+    <Description>WiX Toolset Bundle extension</Description>
+    <Title>WiX Toolset Bundle extension</Title>
     <DebugType>embedded</DebugType>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
diff --git a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
index c99c803f..5bf600fb 100644
--- a/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
+++ b/src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
@@ -5,6 +5,7 @@
     <version>$version$</version>
     <authors>$authors$</authors>
     <owners>$authors$</owners>
+    <icon>wix-white-bg.png</icon>
     <license type="expression">MS-RL</license>
     <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -16,6 +17,7 @@
 
   <files>
     <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
 
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
index 0e89f172..0749e688 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
@@ -6,8 +6,8 @@
     <TargetFramework>netstandard2.0</TargetFramework>
     <DebugType>embedded</DebugType>
     <RootNamespace>WixToolset.Netfx</RootNamespace>
-    <Description>WiX Toolset .NET Framework Extension</Description>
-    <Title>WiX Toolset .NET Framework Extension</Title>
+    <Description>WiX Toolset .NET extension</Description>
+    <Title>WiX Toolset .NET extension</Title>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
 
diff --git a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
index da07f591..73df56ab 100644
--- a/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
+++ b/src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
@@ -3,18 +3,21 @@
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
     <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <icon>wix-white-bg.png</icon>
     <license type="expression">MS-RL</license>
+    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <title>$title$</title>
+    <description>$description$</description>
     <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
   <files>
     <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
 
diff --git a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
index 504d4458..33a43d34 100644
--- a/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+++ b/src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
@@ -3,18 +3,21 @@
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
     <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <icon>wix-white-bg.png</icon>
     <license type="expression">MS-RL</license>
+    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <title>$title$</title>
+    <description>$description$</description>
     <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
   <files>
     <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
 
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
index 434accf3..ea1e8921 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.csproj
@@ -5,8 +5,8 @@
   <PropertyGroup>
     <TargetFramework>netstandard2.0</TargetFramework>
     <RootNamespace>WixToolset.Util</RootNamespace>
-    <Description>WiX Toolset Utility Extension</Description>
-    <Title>WiX Toolset Util Extension</Title>
+    <Description>WiX Toolset Utility extension</Description>
+    <Title>WiX Toolset Utility extension</Title>
     <DebugType>embedded</DebugType>
     <IncludeSymbols>true</IncludeSymbols>
   </PropertyGroup>
diff --git a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
index da07f591..73df56ab 100644
--- a/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
+++ b/src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
@@ -3,18 +3,21 @@
   <metadata minClientVersion="4.0">
     <id>$id$</id>
     <version>$version$</version>
-    <title>$title$</title>
-    <description>$description$</description>
     <authors>$authors$</authors>
+    <owners>$authors$</owners>
+    <icon>wix-white-bg.png</icon>
     <license type="expression">MS-RL</license>
+    <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
+    <title>$title$</title>
+    <description>$description$</description>
     <copyright>$copyright$</copyright>
-    <projectUrl>$projectUrl$</projectUrl>
     <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
   </metadata>
 
   <files>
     <file src="$projectFolder$\$id$.targets" target="build" />
+    <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
 
     <file src="$id$.dll" target="tools" />
 
diff --git a/src/internal/images/wix-black-bg.png b/src/internal/images/wix-black-bg.png
new file mode 100644
index 00000000..375d05a4
--- /dev/null
+++ b/src/internal/images/wix-black-bg.png
diff --git a/src/internal/images/wix-white-bg.png b/src/internal/images/wix-white-bg.png
new file mode 100644
index 00000000..8e752f69
--- /dev/null
+++ b/src/internal/images/wix-white-bg.png
diff --git a/src/version.txt b/src/version.txt
index 1a1c0674..223b9c76 100644
--- a/src/version.txt
+++ b/src/version.txt
@@ -1 +1 @@
-4.0-preview.0-build.{height}
+4.0-preview.0
diff --git a/src/wix/pack-wix/pack-wix.csproj b/src/wix/pack-wix/pack-wix.csproj
index 0be25c8a..bee625ed 100644
--- a/src/wix/pack-wix/pack-wix.csproj
+++ b/src/wix/pack-wix/pack-wix.csproj
@@ -5,7 +5,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
-    <Description>WiX Toolset Command-line interface</Description>
+    <Title>The WiX Toolset command-line interface.</Title>
+    <Description>The WiX Toolset lets developers create installers for Windows. This package contains the WiX Toolset command-line interface.</Description>
     <PackageId>wix</PackageId>
     <NuspecBasePath>$(OutputPath)publish\wix\</NuspecBasePath>
   </PropertyGroup>
diff --git a/src/wix/pack-wix/pack-wix.nuspec b/src/wix/pack-wix/pack-wix.nuspec
index 709d6a5f..7e349ee8 100644
--- a/src/wix/pack-wix/pack-wix.nuspec
+++ b/src/wix/pack-wix/pack-wix.nuspec
@@ -6,6 +6,7 @@
     <title>$title$</title>
     <description>$description$</description>
     <authors>$authors$</authors>
+    <icon>wix-white-bg.png</icon>
     <license type="expression">MS-RL</license>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
 
   <files>
     <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" />
+    <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" />
     <file src="**" target="tools\netcoreapp3.1\any" />
   </files>
 </package>
diff --git a/src/wix/wix/wix.csproj b/src/wix/wix/wix.csproj
index 6d2e3906..34185a06 100644
--- a/src/wix/wix/wix.csproj
+++ b/src/wix/wix/wix.csproj
@@ -5,7 +5,7 @@
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
     <OutputType>Exe</OutputType>
-    <Description>WiX Toolset create installation packages.</Description>
+    <Description>WiX Toolset creates installation packages.</Description>
     <DebugType>embedded</DebugType>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <PackAsTool>true</PackAsTool>