Remove duplicate entries from dotnet --info (#60376) (#60496)

* Remove duplicate entries from dotnet --info * Remove trailing slashes from globally registered locations as well * PR feedback * Tests not ported due to missing infrastructure Co-authored-by: vitek-karas <[email protected]> Co-authored-by: vitek-karas <[email protected]>
dotnet · Oct 22, 2021 · 47b7c1d · 47b7c1d
1 parent d1a6945
commit 47b7c1d
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/src/installer/corehost/cli/hostmisc/pal.windows.cpp b/src/installer/corehost/cli/hostmisc/pal.windows.cpp
@@ -407,11 +407,14 @@ bool pal::get_global_dotnet_dirs(std::vector<pal::string_t>* dirs)
     bool dir_found = false;
     if (pal::get_dotnet_self_registered_dir(&custom_dir))
     {
+        remove_trailing_dir_seperator(&custom_dir);
         dirs->push_back(custom_dir);
         dir_found = true;
     }
     if (get_default_installation_dir(&default_dir))
     {
+        remove_trailing_dir_seperator(&default_dir);
+
         // Avoid duplicate global dirs.
         if (!dir_found || !are_paths_equal_with_normalized_casing(custom_dir, default_dir))
         {