diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-11-02 19:43:20 -0600 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-11-02 19:49:33 -0600 |
| commit | 20ea356b2c0b4ab4d29778b4958d5b363f735f1f (patch) | |
| tree | 64be40843e541eebe37ea0ffb5d7cb996f3ae699 /src/dnchost/dncutil.cpp | |
| parent | 0031d5e8f859b342ac9860b7055bb738b6303ec0 (diff) | |
| download | wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.tar.gz wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.tar.bz2 wix-20ea356b2c0b4ab4d29778b4958d5b363f735f1f.zip | |
More .NET 5 updates.
Fix tests when running on machine with .NET 5.
Update frameworks for .NET Core MBA (3.1 vs 5.0).
Diffstat (limited to 'src/dnchost/dncutil.cpp')
| -rw-r--r-- | src/dnchost/dncutil.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/dnchost/dncutil.cpp b/src/dnchost/dncutil.cpp index 4a82d961..89fe707f 100644 --- a/src/dnchost/dncutil.cpp +++ b/src/dnchost/dncutil.cpp | |||
| @@ -182,7 +182,14 @@ static void HOSTFXR_CALLTYPE DnchostErrorWriter( | |||
| 182 | __in LPCWSTR wzMessage | 182 | __in LPCWSTR wzMessage |
| 183 | ) | 183 | ) |
| 184 | { | 184 | { |
| 185 | BalLog(BOOTSTRAPPER_LOG_LEVEL_ERROR, "error from hostfxr: %ls", wzMessage); | 185 | BOOTSTRAPPER_LOG_LEVEL level = BOOTSTRAPPER_LOG_LEVEL_ERROR; |
| 186 | |||
| 187 | if (CSTR_EQUAL == ::CompareString(LOCALE_INVARIANT, 0, wzMessage, -1, L"The requested delegate type is not available in the target framework.", -1)) | ||
| 188 | { | ||
| 189 | level = BOOTSTRAPPER_LOG_LEVEL_DEBUG; | ||
| 190 | } | ||
| 191 | |||
| 192 | BalLog(level, "error from hostfxr: %ls", wzMessage); | ||
| 186 | } | 193 | } |
| 187 | 194 | ||
| 188 | static HRESULT InitializeHostfxr( | 195 | static HRESULT InitializeHostfxr( |
