diff options
author | Bob Arnson <bob@firegiant.com> | 2020-02-27 14:04:12 -0500 |
---|---|---|
committer | Bob Arnson <bob@firegiant.com> | 2020-02-27 14:08:48 -0500 |
commit | 708d7a342330a10e07fb473745e9156c05049b7f (patch) | |
tree | 70bc5d091c942998e4c71270eb3aacb29a73c00c | |
parent | f30a041627a9c43919bcbe5e96a1cfe55ef11c7c (diff) | |
download | wix-708d7a342330a10e07fb473745e9156c05049b7f.tar.gz wix-708d7a342330a10e07fb473745e9156c05049b7f.tar.bz2 wix-708d7a342330a10e07fb473745e9156c05049b7f.zip |
Log more data from exceptions. Add net472 MSBuild tasks.
Diffstat (limited to '')
-rw-r--r-- | appveyor.cmd | 1 | ||||
-rw-r--r-- | src/WixToolset.BuildTasks/DoIt.cs | 2 | ||||
-rw-r--r-- | src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/appveyor.cmd b/appveyor.cmd index 5d738995..9335ca5a 100644 --- a/appveyor.cmd +++ b/appveyor.cmd | |||
@@ -9,6 +9,7 @@ dotnet test -c Release src\test\WixToolsetTest.WixCop | |||
9 | 9 | ||
10 | dotnet publish -c Release -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix | 10 | dotnet publish -c Release -o %_P%\dotnet-wix\ -f netcoreapp2.1 src\wix |
11 | dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net461\ -f net461 src\WixToolset.BuildTasks | 11 | dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net461\ -f net461 src\WixToolset.BuildTasks |
12 | dotnet publish -c Release -o %_P%\WixToolset.MSBuild\net472\ -f net472 src\WixToolset.BuildTasks | ||
12 | dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netstandard2.0\ -f netstandard2.0 src\WixToolset.BuildTasks | 13 | dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netstandard2.0\ -f netstandard2.0 src\WixToolset.BuildTasks |
13 | 14 | ||
14 | @rem dotnet publish -c Release -o %_P%\netcoreapp2.1 -r win-x86 src\wix | 15 | @rem dotnet publish -c Release -o %_P%\netcoreapp2.1 -r win-x86 src\wix |
diff --git a/src/WixToolset.BuildTasks/DoIt.cs b/src/WixToolset.BuildTasks/DoIt.cs index 6af2a50a..5faf163c 100644 --- a/src/WixToolset.BuildTasks/DoIt.cs +++ b/src/WixToolset.BuildTasks/DoIt.cs | |||
@@ -123,7 +123,7 @@ namespace WixToolset.BuildTasks | |||
123 | } | 123 | } |
124 | catch (Exception e) | 124 | catch (Exception e) |
125 | { | 125 | { |
126 | this.Log.LogErrorFromException(e); | 126 | this.Log.LogErrorFromException(e, showStackTrace: true, showDetail: true, null); |
127 | 127 | ||
128 | if (e is NullReferenceException || e is SEHException) | 128 | if (e is NullReferenceException || e is SEHException) |
129 | { | 129 | { |
diff --git a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec index c49efff0..ba16aa92 100644 --- a/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec +++ b/src/WixToolset.MSBuild/WixToolset.MSBuild.nuspec | |||
@@ -13,6 +13,7 @@ | |||
13 | <files> | 13 | <files> |
14 | <file src="$projectFolder$$id$.props" target="build" /> | 14 | <file src="$projectFolder$$id$.props" target="build" /> |
15 | <file src="net461\*" target="tools\net461" /> | 15 | <file src="net461\*" target="tools\net461" /> |
16 | <file src="net472\*" target="tools\net472" /> | ||
16 | <file src="netstandard2.0\*" target="tools\netstandard2.0" /> | 17 | <file src="netstandard2.0\*" target="tools\netstandard2.0" /> |
17 | </files> | 18 | </files> |
18 | </package> | 19 | </package> |