Remove duplicate entries from dotnet --info (#9186)

ericstj · web-flow · commit 5714f72e58a3 · 2021-10-22T12:45:38.000-07:00
diff --git a/src/corehost/common/pal.windows.cpp b/src/corehost/common/pal.windows.cpp
@@ -356,11 +356,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
`@@ -356,11 +356,14 @@ bool pal::get_global_dotnet_dirs(std::vector<pal::string_t>* dirs)`
`356`	`356`	`bool dir_found = false;`
`357`	`357`	`if (pal::get_dotnet_self_registered_dir(&custom_dir))`
`358`	`358`	`{`
	`359`	`+ remove_trailing_dir_seperator(&custom_dir);`
`359`	`360`	`dirs->push_back(custom_dir);`
`360`	`361`	`dir_found = true;`
`361`	`362`	`}`
`362`	`363`	`if (get_default_installation_dir(&default_dir))`
`363`	`364`	`{`
	`365`	`+ remove_trailing_dir_seperator(&default_dir);`
	`366`	`+`
`364`	`367`	`// Avoid duplicate global dirs.`
`365`	`368`	`if (!dir_found \|\| !are_paths_equal_with_normalized_casing(custom_dir, default_dir))`
`366`	`369`	`{`