From 4bb5d92badfaccb57999c68202b3c3a53db3d472 Mon Sep 17 00:00:00 2001 From: Rob Reynolds Date: Wed, 3 Jun 2015 14:45:20 -0500 Subject: [PATCH] (GH-14) use case insensitive dictionaries --- .../infrastructure.app/services/NugetService.cs | 8 ++++---- .../infrastructure.app/services/RubyGemsService.cs | 6 +++--- .../infrastructure.app/services/WebPiService.cs | 6 +++--- .../infrastructure.app/services/WindowsFeatureService.cs | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/chocolatey/infrastructure.app/services/NugetService.cs b/src/chocolatey/infrastructure.app/services/NugetService.cs index 8a4477c4c8..18eb81056d 100644 --- a/src/chocolatey/infrastructure.app/services/NugetService.cs +++ b/src/chocolatey/infrastructure.app/services/NugetService.cs @@ -86,7 +86,7 @@ public void list_noop(ChocolateyConfiguration config) public ConcurrentDictionary list_run(ChocolateyConfiguration config, bool logResults = true) { - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); var packages = NugetList.GetPackages(config, _nugetLogger).ToList(); @@ -239,7 +239,7 @@ public void install_noop(ChocolateyConfiguration config, Action c public ConcurrentDictionary install_run(ChocolateyConfiguration config, Action continueAction) { _fileSystem.create_directory_if_not_exists(ApplicationParameters.PackagesLocation); - var packageInstalls = new ConcurrentDictionary(); + var packageInstalls = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); //todo: handle all @@ -404,7 +404,7 @@ public ConcurrentDictionary upgrade_run(ChocolateyConfigu public ConcurrentDictionary upgrade_run(ChocolateyConfiguration config, Action continueAction, bool performAction) { _fileSystem.create_directory_if_not_exists(ApplicationParameters.PackagesLocation); - var packageInstalls = new ConcurrentDictionary(); + var packageInstalls = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); SemanticVersion version = config.Version != null ? new SemanticVersion(config.Version) : null; var packageManager = NugetCommon.GetPackageManager( @@ -754,7 +754,7 @@ public ConcurrentDictionary uninstall_run(ChocolateyConfi public ConcurrentDictionary uninstall_run(ChocolateyConfiguration config, Action continueAction, bool performAction) { - var packageUninstalls = new ConcurrentDictionary(); + var packageUninstalls = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); SemanticVersion version = config.Version != null ? new SemanticVersion(config.Version) : null; var packageManager = NugetCommon.GetPackageManager(config, _nugetLogger, diff --git a/src/chocolatey/infrastructure.app/services/RubyGemsService.cs b/src/chocolatey/infrastructure.app/services/RubyGemsService.cs index bb922cd9c0..c2bf31b382 100644 --- a/src/chocolatey/infrastructure.app/services/RubyGemsService.cs +++ b/src/chocolatey/infrastructure.app/services/RubyGemsService.cs @@ -132,7 +132,7 @@ public void list_noop(ChocolateyConfiguration config) public ConcurrentDictionary list_run(ChocolateyConfiguration config, bool logResults) { - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); var args = ExternalCommandArgsBuilder.build_arguments(config, _listArguments); Environment.ExitCode = _commandExecutor.execute( @@ -172,7 +172,7 @@ public void install_noop(ChocolateyConfiguration config, Action c public ConcurrentDictionary install_run(ChocolateyConfiguration config, Action continueAction) { - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); var args = ExternalCommandArgsBuilder.build_arguments(config, _installArguments); foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries)) @@ -236,7 +236,7 @@ public ConcurrentDictionary install_run(ChocolateyConfigu public ConcurrentDictionary upgrade_noop(ChocolateyConfiguration config, Action continueAction) { this.Log().Warn(ChocolateyLoggers.Important, "{0} does not implement upgrade".format_with(APP_NAME)); - return new ConcurrentDictionary(); + return new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); } public ConcurrentDictionary upgrade_run(ChocolateyConfiguration config, Action continueAction) diff --git a/src/chocolatey/infrastructure.app/services/WebPiService.cs b/src/chocolatey/infrastructure.app/services/WebPiService.cs index 1f880e30c4..a04e2f027d 100644 --- a/src/chocolatey/infrastructure.app/services/WebPiService.cs +++ b/src/chocolatey/infrastructure.app/services/WebPiService.cs @@ -128,7 +128,7 @@ public void list_noop(ChocolateyConfiguration config) public ConcurrentDictionary list_run(ChocolateyConfiguration config, bool logResults) { - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); var args = ExternalCommandArgsBuilder.build_arguments(config, _listArguments); //var whereToStartRecording = "---"; @@ -185,7 +185,7 @@ public void install_noop(ChocolateyConfiguration config, Action c public ConcurrentDictionary install_run(ChocolateyConfiguration config, Action continueAction) { - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); var args = ExternalCommandArgsBuilder.build_arguments(config, _installArguments); foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries)) @@ -242,7 +242,7 @@ public ConcurrentDictionary install_run(ChocolateyConfigu public ConcurrentDictionary upgrade_noop(ChocolateyConfiguration config, Action continueAction) { this.Log().Warn(ChocolateyLoggers.Important, "{0} does not implement upgrade".format_with(APP_NAME)); - return new ConcurrentDictionary(); + return new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); } public ConcurrentDictionary upgrade_run(ChocolateyConfiguration config, Action continueAction) diff --git a/src/chocolatey/infrastructure.app/services/WindowsFeatureService.cs b/src/chocolatey/infrastructure.app/services/WindowsFeatureService.cs index ce91cdd8ae..46b18cafef 100644 --- a/src/chocolatey/infrastructure.app/services/WindowsFeatureService.cs +++ b/src/chocolatey/infrastructure.app/services/WindowsFeatureService.cs @@ -184,7 +184,7 @@ public ConcurrentDictionary list_run(ChocolateyConfigurat { set_executable_path_if_not_set(); var args = build_args(config, _listArguments); - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); Environment.ExitCode = _commandExecutor.execute( _exePath, @@ -249,7 +249,7 @@ public ConcurrentDictionary install_run(ChocolateyConfigu { set_executable_path_if_not_set(); var args = build_args(config, _installArguments); - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries)) { @@ -311,7 +311,7 @@ public ConcurrentDictionary upgrade_noop(ChocolateyConfig { set_executable_path_if_not_set(); this.Log().Warn(ChocolateyLoggers.Important, "{0} does not implement upgrade".format_with(APP_NAME)); - return new ConcurrentDictionary(); + return new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); } public ConcurrentDictionary upgrade_run(ChocolateyConfiguration config, Action continueAction) @@ -331,7 +331,7 @@ public ConcurrentDictionary uninstall_run(ChocolateyConfi { set_executable_path_if_not_set(); var args = build_args(config, _uninstallArguments); - var packageResults = new ConcurrentDictionary(); + var packageResults = new ConcurrentDictionary(StringComparer.InvariantCultureIgnoreCase); foreach (var packageToInstall in config.PackageNames.Split(new[] {' '}, StringSplitOptions.RemoveEmptyEntries)) {