From 47b7c1d68d993623bde784548cce2f3c0e64d5ed Mon Sep 17 00:00:00 2001
From: Eric StJohn <ericstj@microsoft.com>
Date: Fri, 22 Oct 2021 13:13:21 -0700
Subject: [PATCH] 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 <vitek.karas@microsoft.com>

Co-authored-by: vitek-karas <vitek.karas@microsoft.com>
---
 src/installer/corehost/cli/hostmisc/pal.windows.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/installer/corehost/cli/hostmisc/pal.windows.cpp b/src/installer/corehost/cli/hostmisc/pal.windows.cpp
index 951700d85a6853..666b31b4c95312 100644
--- 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))
         {