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

ericstj · vitek-karas · web-flow · commit 47b7c1d68d99 · 2021-10-22T13:13:21.000-07:00
* 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 &lt;vitek.karas@microsoft.com&gt;

Co-authored-by: vitek-karas &lt;vitek.karas@microsoft.com&gt;
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))
         {

Original file line number	Diff line number	Diff line change
`@@ -407,11 +407,14 @@ bool pal::get_global_dotnet_dirs(std::vector<pal::string_t>* dirs)`
`407`	`407`	`bool dir_found = false;`
`408`	`408`	`if (pal::get_dotnet_self_registered_dir(&custom_dir))`
`409`	`409`	`{`
	`410`	`+ remove_trailing_dir_seperator(&custom_dir);`
`410`	`411`	`dirs->push_back(custom_dir);`
`411`	`412`	`dir_found = true;`
`412`	`413`	`}`
`413`	`414`	`if (get_default_installation_dir(&default_dir))`
`414`	`415`	`{`
	`416`	`+ remove_trailing_dir_seperator(&default_dir);`
	`417`	`+`
`415`	`418`	`// Avoid duplicate global dirs.`
`416`	`419`	`if (!dir_found \|\| !are_paths_equal_with_normalized_casing(custom_dir, default_dir))`
`417`	`420`	`{`