From a5ec57d999c2399acf2b97297451639c3f5730b2 Mon Sep 17 00:00:00 2001 From: James Truher Date: Mon, 9 Dec 2019 13:07:00 -0800 Subject: [PATCH] Change comment and element text to meet MS standards --- .../commands/utility/ImplicitRemotingCommands.cs | 2 +- .../host/msh/ConsoleHostUserInterface.cs | 4 ++-- .../CoreCLR/CorePsAssemblyLoadContext.cs | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs index b36916ce772..06a5459ad58 100644 --- a/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs +++ b/src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs @@ -1199,7 +1199,7 @@ private bool IsSafeCommandMetadata(CommandMetadata commandMetadata) Dbg.Assert(parameter.Attributes == null || parameter.Attributes.Count == 0, "Attributes shouldn't get rehydrated"); - // sanitize - remove type constraint that are not whitelisted + // sanitize - remove type constraint that are not allowed if (!IsSafeTypeConstraint(parameter.ParameterType)) { parameter.ParameterType = null; diff --git a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs index 3862df694e9..1addb3dc5b0 100644 --- a/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs +++ b/src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHostUserInterface.cs @@ -358,7 +358,7 @@ private object ReadLineSafe(bool isSecureString, char? printToken) #if UNIX else if (char.IsControl(keyInfo.KeyChar)) { - // blacklist control characters + // deny list control characters continue; } #endif @@ -1785,7 +1785,7 @@ private string ReadLineFromConsole(bool endOnTab, string initialContent, bool ca if (char.IsControl(keyInfo.KeyChar)) { - // blacklist control characters + // deny list control characters continue; } diff --git a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs index bd83357807f..c034d355559 100644 --- a/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs +++ b/src/System.Management.Automation/CoreCLR/CorePsAssemblyLoadContext.cs @@ -113,7 +113,7 @@ private PowerShellAssemblyLoadContext(string basePaths) // - Value: strong name of the TPA that contains the type represented by Key. private readonly Dictionary _coreClrTypeCatalog; private readonly Lazy> _availableDotNetAssemblyNames; - private readonly HashSet _blackListedAssemblies = new HashSet(StringComparer.OrdinalIgnoreCase){ + private readonly HashSet _denyListedAssemblies = new HashSet(StringComparer.OrdinalIgnoreCase){ "System.Windows.Forms" }; @@ -331,7 +331,7 @@ private Assembly Resolve(AssemblyLoadContext loadContext, AssemblyName assemblyN private bool TryFindInGAC(AssemblyName assemblyName, out string assemblyFilePath) { assemblyFilePath = null; - if (_blackListedAssemblies.Contains(assemblyName.Name)) + if (_denyListedAssemblies.Contains(assemblyName.Name)) { // DotNet catches and throws a new exception with no inner exception // We cannot change the message DotNet returns.