Merge branch 'master' of https://gitbox.apache.org/repos/asf/ant-antlibs-dotnet

diff --cc docs/dotnetexec.html
Simple merge

diff --cc docs/index.html
Simple merge

diff --cc docs/nant.html
Simple merge

diff --cc docs/nunit.html
Simple merge

diff --cc docs/old-core.html
Simple merge

diff --cc docs/tallow.html
Simple merge

diff --cc docs/wix.html
Simple merge

diff --cc prepare.xml
Simple merge

diff --cc src/main/org/apache/ant/dotnet/NUnitTask.java
Simple merge

diff --cc src/main/org/apache/ant/dotnet/wix/TallowTask.java
Simple merge

diff --cc src/main/org/apache/ant/dotnet/wix/WixTask.java
Simple merge