Update files from Source Depot changeset [SD:709766]

Corresponds to 15b1623435d6a195d1e877ba5c43709d991f573a in psl-monad.

Author: PowerShellTeam

src/Microsoft.PowerShell.Commands.Management/commands/management/Service.cs

@@ -1677,7 +1677,6 @@ public string Status
         /// <summary>
         /// 
         /// </summary>
-        [ArchitectureSensitive]
         protected override void ProcessRecord()
         {
 
@@ -2065,7 +2064,6 @@ public string[] DependsOn
         /// <summary>
         /// Create the service
         /// </summary>
-        [ArchitectureSensitive]
         protected override void BeginProcessing()
         {
             Diagnostics.Assert(!String.IsNullOrEmpty(Name),

src/Microsoft.PowerShell.Commands.Utility/commands/utility/AddType.cs

@@ -490,13 +490,6 @@ public String[] ReferencedAssemblies
         internal bool referencedAssembliesSpecified = false;
         internal string[] referencedAssemblies = Utils.EmptyArray<string>();
 
-        /// <summary>
-        /// Resolve referenced assembly from name or path to a platform specific form.
-        /// </summary>
-        /// <param name="referencedAssembly"></param>
-        /// <returns></returns>
-        internal abstract string ResolveReferencedAssembly(string referencedAssembly);
-
         /// <summary>
         /// The path to the output assembly
         /// </summary>
@@ -998,7 +991,14 @@ private void LoadAssemblies(IEnumerable<string> assemblies)
         {
             foreach (string assemblyName in assemblies)
             {
-                Assembly assembly = LoadFrom(ResolveReferencedAssembly(assemblyName));
+                // CoreCLR doesn't allow re-load TPA assemblis with different API (i.e. we load them by name and now want to load by path).
+                // LoadAssemblyHelper helps us avoid re-loading them, if they already loaded.
+                Assembly assembly = LoadAssemblyHelper(assemblyName);
+                if (assembly == null)
+                {
+                    assembly = LoadFrom(ResolveReferencedAssembly(assemblyName));
+                }
+
                 if (passThru)
                 {
                     WriteTypes(assembly);
@@ -1072,7 +1072,7 @@ private void CheckTypesForDuplicates(Assembly assembly)
 
         private bool InMemory { get { return String.IsNullOrEmpty(outputAssembly); } }
 
-        internal override string ResolveReferencedAssembly(string referencedAssembly)
+        private string ResolveReferencedAssembly(string referencedAssembly)
         {
             // if it's a path, resolve it
             if (referencedAssembly.Contains(System.IO.Path.DirectorySeparatorChar) || referencedAssembly.Contains(System.IO.Path.AltDirectorySeparatorChar))
@@ -1143,6 +1143,9 @@ private Assembly LoadAssemblyHelper(string assemblyName)
             // Generates a FileNotFoundException if you can't load the strong type.
             // So we'll try from the short name.
             catch (System.IO.FileNotFoundException) { }
+            // File load exception can happen, when we trying to load from the incorrect assembly name
+            // or file corrupted.
+            catch (System.IO.FileLoadException) { }
 
             if (loadedAssembly != null)
                 return loadedAssembly;
@@ -1339,7 +1342,7 @@ internal override void PostSetLanguage(Language language)
         // Internal mapping table from the shortcut name to the strong name
         private static readonly Lazy<ConcurrentDictionary<string, string>> StrongNames = new Lazy<ConcurrentDictionary<string, string>>(InitializeStrongNameDictionary);
 
-        internal override string ResolveReferencedAssembly(string referencedAssembly)
+        private string ResolveReferencedAssembly(string referencedAssembly)
         {
             if (!String.Equals(System.IO.Path.GetExtension(referencedAssembly), ".dll", StringComparison.OrdinalIgnoreCase))
             {

src/Microsoft.PowerShell.Commands.Utility/commands/utility/SetDateCommand.cs

@@ -83,7 +83,6 @@ public DisplayHintType DisplayHint
         /// <summary>
         /// set the date
         /// </summary> 
-        [ArchitectureSensitive]
         protected override void ProcessRecord()
         {
             DateTime dateToUse;

src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleHost.cs

@@ -1359,7 +1359,7 @@ private uint Run(CommandLineParameterParser cpp, bool isPrestartWarned)
                 inputFormat = cpp.InputFormat;
                 wasInitialCommandEncoded = cpp.WasInitialCommandEncoded;
 
-                ui.ReadFromStdin = cpp.ExplicitReadCommandsFromStdin || Console.IsInputRedirected;
+                ui.ReadFromStdin = cpp.ExplicitReadCommandsFromStdin || (Console.IsInputRedirected && !cpp.NonInteractive);
                 ui.NoPrompt = cpp.NoPrompt;
                 ui.ThrowOnReadAndPrompt = cpp.ThrowOnReadAndPrompt;
                 noExit = cpp.NoExit;

src/Microsoft.PowerShell.ConsoleHost/host/msh/ConsoleShell.cs

@@ -17,40 +17,28 @@ namespace Microsoft.PowerShell
     public static 
     class ConsoleShell
     {
-        /// <summary>
-        /// Entry point in to ConsoleShell. This method is called by
-        /// main of minishell. 
-        /// </summary>
-        /// <param name="configuration">
-        /// Configuration information which is used to create Runspace.
-        /// </param>
-        /// 
-        /// <param name="bannerText">
-        /// Banner text to be displayed by ConsoleHost
-        /// </param>
-        /// 
-        /// <param name="helpText">
-        /// Help text for minishell. This is displayed on 'minishell -?'.
-        /// </param>
-        /// 
-        /// <param name="args">
-        /// Commandline parameters specified by user.
-        /// </param>
-        /// 
-        /// <returns>
-        /// An integer value which should be used as exit code for the
-        /// process.
-        /// </returns>
-        /// 
-        public static
-        int
-        Start(RunspaceConfiguration configuration,
-              string bannerText,
-              string helpText,
-              string[] args)
+#if CORECLR
+        /// <summary>Entry point in to ConsoleShell. This method is called by main of minishell.</summary>
+        /// <param name="bannerText">Banner text to be displayed by ConsoleHost</param>
+        /// <param name="helpText">Help text for minishell. This is displayed on 'minishell -?'.</param>
+        /// <param name="args">Commandline parameters specified by user.</param>
+        /// <returns>An integer value which should be used as exit code for the process.</returns>
+        public static int Start(string bannerText, string helpText, string[] args)
+        {
+            return Start(null, bannerText, helpText, null, args);
+        }
+#else
+        /// <summary>Entry point in to ConsoleShell. This method is called by main of minishell.</summary>
+        /// <param name="configuration">Configuration information which is used to create Runspace.</param>
+        /// <param name="bannerText">Banner text to be displayed by ConsoleHost</param>
+        /// <param name="helpText">Help text for minishell. This is displayed on 'minishell -?'.</param>
+        /// <param name="args">Commandline parameters specified by user.</param>
+        /// <returns>An integer value which should be used as exit code for the process.</returns>
+        public static int Start(RunspaceConfiguration configuration, string bannerText, string helpText, string[] args)
         {
             return Start(configuration, bannerText, helpText, null, args);
         }
+#endif
 
         /// <summary>
         /// 
@@ -82,7 +70,7 @@ public static
         /// An integer value which should be used as exit code for the
         /// process.
         /// </returns>
-        
+
         internal static
         int
         Start(RunspaceConfiguration configuration,

src/Microsoft.PowerShell.Security/security/CertificateProvider.cs

@@ -3843,7 +3843,6 @@ internal static class Crypt32Helpers
         /// <summary>
         /// get a list of store names at the specified location
         /// </summary>        
-        [ArchitectureSensitive]
         internal static List<string> GetStoreNamesAtLocation(StoreLocation location)
         {
             Security.NativeMethods.CertStoreFlags locationFlag =

src/Microsoft.PowerShell.Security/security/Utils.cs

@@ -131,7 +131,6 @@ internal static SecureString PromptForSecureString(PSHostUserInterface hostUI,
         ///
         /// <remarks>  </remarks>
         ///
-        [ArchitectureSensitive]
         internal static string GetStringFromSecureString(SecureString ss)
         {
             IntPtr p = Marshal.SecureStringToGlobalAllocUnicode(ss);