Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

WiX Toolset v4-preview.0 #5

Merged
merged 1 commit into from
May 18, 2021
Merged

WiX Toolset v4-preview.0 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

Expand Down
1 change: 1 addition & 0 deletions src/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions src/ext/Bal/wixext/WixToolset.Bal.wixext.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/ext/Bal/wixext/WixToolset.Bal.wixext.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />

Expand Down
4 changes: 2 additions & 2 deletions src/ext/NetFx/wixext/WixToolset.Netfx.wixext.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down
9 changes: 6 additions & 3 deletions src/ext/NetFx/wixext/WixToolset.Netfx.wixext.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
9 changes: 6 additions & 3 deletions src/ext/UI/wixext/WixToolset.UI.wixext.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
4 changes: 2 additions & 2 deletions src/ext/Util/wixext/WixToolset.Util.wixext.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
9 changes: 6 additions & 3 deletions src/ext/Util/wixext/WixToolset.Util.wixext.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

Expand Down
Binary file added src/internal/images/wix-black-bg.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added src/internal/images/wix-white-bg.png
View file
Open in desktop
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0-preview.0-build.{height}
4.0-preview.0
3 changes: 2 additions & 1 deletion src/wix/pack-wix/pack-wix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions src/wix/pack-wix/pack-wix.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
2 changes: 1 addition & 1 deletion src/wix/wix/wix.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down