diff --git a/docs/antlibs/dotnet/index.html b/docs/antlibs/dotnet/index.html index 820550dc7e..1ead62d240 100755 --- a/docs/antlibs/dotnet/index.html +++ b/docs/antlibs/dotnet/index.html @@ -124,9 +124,8 @@

other platform. Of course you can override these assumptions.

Based on this a few tasks to run well known .NET utilities - from within Ant are provided, namely tasks to run NUnit, NAnt and MSBuild.

-

There also is some experimental Wix task, but it probably doesn't - do anything useful at all.

+ from within Ant are provided, namely tasks to run NUnit, NAnt, MSBuild + and the Wix toolkit.

Tasks @@ -153,6 +152,12 @@

Invokes MSBuild, either on an external file or a build file snippet contained inside your Ant build file.

+

+ + wix +

+

Invokes the candle and light executables of the WiX toolkit + in order to create MSI installers from within Ant.

Examples diff --git a/docs/manual/CoreTasks/ant.html b/docs/manual/CoreTasks/ant.html index 1edcd49492..7dd1bf9506 100644 --- a/docs/manual/CoreTasks/ant.html +++ b/docs/manual/CoreTasks/ant.html @@ -280,4 +280,4 @@

Examples

Reserved.

- \ No newline at end of file + diff --git a/xdocs/antlibs/dotnet/index.xml b/xdocs/antlibs/dotnet/index.xml index 1eb9b5ef1b..544420d21d 100755 --- a/xdocs/antlibs/dotnet/index.xml +++ b/xdocs/antlibs/dotnet/index.xml @@ -41,12 +41,9 @@

Based on this a few tasks to run well known .NET utilities from within Ant are provided, namely tasks to run NUnit, NAnt and MSBuild.

- -

There also is some experimental Wix task, but it probably doesn't - do anything useful at all.

+ href="http://nant.sf.net/">NAnt, MSBuild + and the Wix toolkit.

@@ -67,6 +64,11 @@

Invokes MSBuild, either on an external file or a build file snippet contained inside your Ant build file.

+ + +

Invokes the candle and light executables of the WiX toolkit + in order to create MSI installers from within Ant.

+
@@ -143,4 +145,4 @@ Total time: 0 seconds
- \ No newline at end of file +