@joebigelow / wix / commits / 20e21904

Add overload for UnexpectedException that takes the exception so inner exceptions can also be part of the message.

Add overload for UnexpectedException that takes the exception so inner exceptions can also be part of the message.

Sean Hall committed May 13, 2020 at 14:28 UTC 20e2190443f2e47dae1cb8c6fc1abb4d2e213e6b
3 files changed +7 -2
appveyor.yml
+1 -1
@@ -8,7 +8,7 @@ branches:
8 - master
9 - develop
10
11 -image: Visual Studio 2017
11 +image: Visual Studio 2019
12
13 version: 0.0.0.{build}
14 configuration: Release
src/WixToolset.Data/ErrorMessages.cs
+5
@@ -2044,6 +2044,11 @@ namespace WixToolset.Data
2044 return Message(sourceLineNumbers, Ids.UnexpectedEmptySubexpression, "The empty subexpression is unexpected in the expression '{0}'.", expression);
2045 }
2046
2047 + public static Message UnexpectedException(Exception exception)
2048 + {
2049 + return Message(null, Ids.UnexpectedException, exception.ToString());
2050 + }
2051 +
2052 public static Message UnexpectedException(string message, string type, string stackTrace)
2053 {
2054 return Message(null, Ids.UnexpectedException, "{0}\r\n\r\nException Type: {1}\r\n\r\nStack Trace:\r\n{2}", message, type, stackTrace);
src/WixToolset.Data/WixToolset.Data.csproj
+1 -1
@@ -16,7 +16,7 @@
16 </ItemGroup>
17
18 <ItemGroup>
19 - <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
19 + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All" />
20 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="all" />
21 </ItemGroup>
22 </Project>