From bfa1a9bf103cfc04ff6f8d562488c8986eebe208 Mon Sep 17 00:00:00 2001 From: danmosemsft Date: Mon, 20 Nov 2017 15:37:01 -0800 Subject: [PATCH] Feedback Commit migrated from https://github.com/dotnet/core-setup/commit/c5965abccf25789feeb46fd82aa3b06fca0a1c9d --- src/installer/corehost/corehost.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/installer/corehost/corehost.cpp b/src/installer/corehost/corehost.cpp index ab2d6ca..782db6c 100644 --- a/src/installer/corehost/corehost.cpp +++ b/src/installer/corehost/corehost.cpp @@ -90,7 +90,7 @@ pal::string_t resolve_fxr_path(const pal::string_t& own_dir) return fxr_path; } - trace::error(_X("A fatal error occurred, the required library %s could not be found at %s"), LIBFXR_NAME, own_dir.c_str()); + trace::error(_X("A fatal error occurred, the required library %s could not be found at [%s]"), LIBFXR_NAME, own_dir.c_str()); return pal::string_t(); #else pal::string_t fxr_dir = own_dir; @@ -98,7 +98,7 @@ pal::string_t resolve_fxr_path(const pal::string_t& own_dir) append_path(&fxr_dir, _X("fxr")); if (!pal::directory_exists(fxr_dir)) { - trace::error(_X("A fatal error occurred, the folder %s does not exist"), fxr_dir.c_str()); + trace::error(_X("A fatal error occurred, the folder [%s] does not exist"), fxr_dir.c_str()); return pal::string_t(); } @@ -121,9 +121,9 @@ pal::string_t resolve_fxr_path(const pal::string_t& own_dir) } } - if (max_ver.get_major() == -1) + if (max_ver == fx_ver_t(-1, -1, -1)) { - trace::error(_X("A fatal error occurred, the folder %s does not contain any version-numbered child folders"), fxr_dir.c_str()); + trace::error(_X("A fatal error occurred, the folder [%s] does not contain any version-numbered child folders"), fxr_dir.c_str()); return pal::string_t(); } @@ -138,7 +138,7 @@ pal::string_t resolve_fxr_path(const pal::string_t& own_dir) return ret_path; } - trace::error(_X("A fatal error occurred, the required library %s could not be found in %s"), LIBFXR_NAME, fxr_dir.c_str()); + trace::error(_X("A fatal error occurred, the required library %s could not be found in [%s]"), LIBFXR_NAME, fxr_dir.c_str()); return pal::string_t(); #endif -- 2.7.4