@joebigelow / wix / commits / 824e72cf

WiX Toolset v4-preview.0

Rob Mensching committed May 17, 2021 at 15:11 UTC 824e72cfc0653450e074bebfb51f61b8ecd86085
15 files changed +38 -19
README.md
+5 -1
@@ -1,4 +1,8 @@
1 -<img src="https://github.com/wixtoolset/Home/raw/master/imgs/wix-white-bg.png" alt="WiX Toolset" height="128" />
1 +![WiX Toolset](https://github.com/wixtoolset/Home/raw/master/imgs/wix-white-bg.png)
2 +
3 +https://img.shields.io/nuget/vpre/wix
4 +https://img.shields.io/nuget/dt/wix
5 +https://img.shields.io/appveyor/build/wixtoolset/wix4
6
7 # WiX Toolset v4
8
src/Directory.Build.props
+1
@@ -22,6 +22,7 @@
22 <Copyright>Copyright (c) .NET Foundation and contributors. All rights reserved.</Copyright>
23 <PackageLicenseExpression>MS-RL</PackageLicenseExpression>
24 <Product>WiX Toolset</Product>
25 + <ProjectUrl>https://wixtoolset.org/</ProjectUrl>
26
27 <GitThisAssembly>false</GitThisAssembly>
28 <GitVersionFile>version.txt</GitVersionFile>
src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
+2 -2
@@ -5,8 +5,8 @@
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 <RootNamespace>WixToolset.Bal</RootNamespace>
8 - <Description>WiX Toolset Bal Extension</Description>
9 - <Title>WiX Toolset Bal Extension</Title>
8 + <Description>WiX Toolset Bundle extension</Description>
9 + <Title>WiX Toolset Bundle extension</Title>
10 <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
+2
@@ -5,6 +5,7 @@
5 <version>$version$</version>
6 <authors>$authors$</authors>
7 <owners>$authors$</owners>
8 + <icon>wix-white-bg.png</icon>
9 <license type="expression">MS-RL</license>
10 <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
@@ -16,6 +17,7 @@
17
18 <files>
19 <file src="$projectFolder$\$id$.targets" target="build" />
20 + <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
22 <file src="$id$.dll" target="tools" />
23
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
+2 -2
@@ -6,8 +6,8 @@
6 <TargetFramework>netstandard2.0</TargetFramework>
7 <DebugType>embedded</DebugType>
8 <RootNamespace>WixToolset.Netfx</RootNamespace>
9 - <Description>WiX Toolset .NET Framework Extension</Description>
10 - <Title>WiX Toolset .NET Framework Extension</Title>
9 + <Description>WiX Toolset .NET extension</Description>
10 + <Title>WiX Toolset .NET extension</Title>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
13
src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
+6 -3
@@ -3,18 +3,21 @@
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 - <title>$title$</title>
7 - <description>$description$</description>
6 <authors>$authors$</authors>
7 + <owners>$authors$</owners>
8 + <icon>wix-white-bg.png</icon>
9 <license type="expression">MS-RL</license>
10 + <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 + <title>$title$</title>
13 + <description>$description$</description>
14 <copyright>$copyright$</copyright>
12 - <projectUrl>$projectUrl$</projectUrl>
15 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16 </metadata>
17
18 <files>
19 <file src="$projectFolder$\$id$.targets" target="build" />
20 + <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
22 <file src="$id$.dll" target="tools" />
23
src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
+6 -3
@@ -3,18 +3,21 @@
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 - <title>$title$</title>
7 - <description>$description$</description>
6 <authors>$authors$</authors>
7 + <owners>$authors$</owners>
8 + <icon>wix-white-bg.png</icon>
9 <license type="expression">MS-RL</license>
10 + <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 + <title>$title$</title>
13 + <description>$description$</description>
14 <copyright>$copyright$</copyright>
12 - <projectUrl>$projectUrl$</projectUrl>
15 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16 </metadata>
17
18 <files>
19 <file src="$projectFolder$\$id$.targets" target="build" />
20 + <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
22 <file src="$id$.dll" target="tools" />
23
src/ext/Util/wixext/WixToolset.Util.wixext.csproj
+2 -2
@@ -5,8 +5,8 @@
5 <PropertyGroup>
6 <TargetFramework>netstandard2.0</TargetFramework>
7 <RootNamespace>WixToolset.Util</RootNamespace>
8 - <Description>WiX Toolset Utility Extension</Description>
9 - <Title>WiX Toolset Util Extension</Title>
8 + <Description>WiX Toolset Utility extension</Description>
9 + <Title>WiX Toolset Utility extension</Title>
10 <DebugType>embedded</DebugType>
11 <IncludeSymbols>true</IncludeSymbols>
12 </PropertyGroup>
src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
+6 -3
@@ -3,18 +3,21 @@
3 <metadata minClientVersion="4.0">
4 <id>$id$</id>
5 <version>$version$</version>
6 - <title>$title$</title>
7 - <description>$description$</description>
6 <authors>$authors$</authors>
7 + <owners>$authors$</owners>
8 + <icon>wix-white-bg.png</icon>
9 <license type="expression">MS-RL</license>
10 + <projectUrl>https://github.com/wixtoolset/Bal.wixext</projectUrl>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 + <title>$title$</title>
13 + <description>$description$</description>
14 <copyright>$copyright$</copyright>
12 - <projectUrl>$projectUrl$</projectUrl>
15 <repository type="$repositorytype$" url="$repositoryurl$" commit="$repositorycommit$" />
16 </metadata>
17
18 <files>
19 <file src="$projectFolder$\$id$.targets" target="build" />
20 + <file src="$projectFolder$\..\..\..\internal\images\wix-white-bg.png" />
21
22 <file src="$id$.dll" target="tools" />
23
src/internal/images/wix-black-bg.png
Binary files /dev/null and b/src/internal/images/wix-black-bg.png differ
src/internal/images/wix-white-bg.png
Binary files /dev/null and b/src/internal/images/wix-white-bg.png differ
src/version.txt
+1 -1
@@ -1 +1 @@
1 -4.0-preview.0-build.{height}
1 +4.0-preview.0
src/wix/pack-wix/pack-wix.csproj
+2 -1
@@ -5,7 +5,8 @@
5 <PropertyGroup>
6 <TargetFramework>netcoreapp3.1</TargetFramework>
7 <IncludeBuildOutput>false</IncludeBuildOutput>
8 - <Description>WiX Toolset Command-line interface</Description>
8 + <Title>The WiX Toolset command-line interface.</Title>
9 + <Description>The WiX Toolset lets developers create installers for Windows. This package contains the WiX Toolset command-line interface.</Description>
10 <PackageId>wix</PackageId>
11 <NuspecBasePath>$(OutputPath)publish\wix\</NuspecBasePath>
12 </PropertyGroup>
src/wix/pack-wix/pack-wix.nuspec
+2
@@ -6,6 +6,7 @@
6 <title>$title$</title>
7 <description>$description$</description>
8 <authors>$authors$</authors>
9 + <icon>wix-white-bg.png</icon>
10 <license type="expression">MS-RL</license>
11 <requireLicenseAcceptance>false</requireLicenseAcceptance>
12 <copyright>$copyright$</copyright>
@@ -18,6 +19,7 @@
19
20 <files>
21 <file src="$projectFolder$\DotnetToolSettings.xml" target="tools\netcoreapp3.1\any" />
22 + <file src="$projectFolder$\..\..\internal\images\wix-white-bg.png" />
23 <file src="**" target="tools\netcoreapp3.1\any" />
24 </files>
25 </package>
src/wix/wix/wix.csproj
+1 -1
@@ -5,7 +5,7 @@
5 <PropertyGroup>
6 <TargetFrameworks>netcoreapp3.1;net461</TargetFrameworks>
7 <OutputType>Exe</OutputType>
8 - <Description>WiX Toolset create installation packages.</Description>
8 + <Description>WiX Toolset creates installation packages.</Description>
9 <DebugType>embedded</DebugType>
10 <PublishRepositoryUrl>true</PublishRepositoryUrl>
11 <PackAsTool>true</PackAsTool>