Revert "Update files from psl-monad"

This reverts commit 9ed2c2a68b.
This commit is here to make source-depot branch a parent of master
This commit is contained in:
PowerShell Team authored and Sergei Vorobev committed 2016-04-06 12:03:50 -07:00
1 parent 9ed2c2a68b
commit 78a18c3f70
234 files changed
+2782 -767

No files matched your search

@@ -1137,7 +1137,7 @@ namespace Microsoft.PowerShell.Commands
// First try by strong name
try
{
loadedAssembly = System.Reflection.Assembly.Load(new AssemblyName(assemblyName));
loadedAssembly = ClrFacade.Load(new AssemblyName(assemblyName));
}
// Generates a FileNotFoundException if you can't load the strong type.
// So we'll try from the short name.
@@ -1912,7 +1912,7 @@ namespace Microsoft.PowerShell.Commands
{
foreach(string path in paths)
{
generatedTypes.AddRange(System.Reflection.Assembly.LoadFrom(path).GetTypes());
generatedTypes.AddRange(ClrFacade.LoadFrom(path).GetTypes());
}
}
// Load the assembly by name
@@ -2030,7 +2030,7 @@ namespace Microsoft.PowerShell.Commands
// First try by strong name
try
{
loadedAssembly = System.Reflection.Assembly.Load(assemblyName);
loadedAssembly = ClrFacade.Load(assemblyName);
}
// Generates a FileNotFoundException if you can't load the strong type.
// So we'll try from the short name.
@@ -2042,7 +2042,7 @@ namespace Microsoft.PowerShell.Commands
// Next, try an exact match
if (StrongNames.Value.ContainsKey(assemblyName))
{
return System.Reflection.Assembly.Load(StrongNames.Value[assemblyName]);
return ClrFacade.Load(StrongNames.Value[assemblyName]);
}
// If the assembly name doesn't contain wildcards, return null. The caller generates an error here.
@@ -2085,7 +2085,7 @@ namespace Microsoft.PowerShell.Commands
return null;
// Otherwise, load the assembly.
return System.Reflection.Assembly.Load(matchedStrongName);
return ClrFacade.Load(matchedStrongName);
}
private static ConcurrentDictionary<string, string> InitializeStrongNameDictionary()
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -56,4 +57,5 @@ namespace Microsoft.PowerShell.Commands
return HostUtilities.GetMaxLines(srcString, 10);
}
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -38,4 +39,5 @@ namespace Microsoft.PowerShell.Commands
return objectResult == null ? String.Empty : ColumnInfo.LimitString(objectResult.ToString());
}
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -59,4 +60,5 @@ namespace Microsoft.PowerShell.Commands
return staleObject;
}
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -71,3 +72,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -529,3 +530,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -307,3 +308,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -76,4 +77,5 @@ namespace Microsoft.PowerShell.Commands
return index++;
}
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
//
// Copyright (C) Microsoft. All rights reserved.
//
@@ -281,3 +282,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -331,3 +332,5 @@ namespace Microsoft.PowerShell.Commands.Internal.Format
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -74,3 +75,5 @@ namespace Microsoft.PowerShell.Commands
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -2031,9 +2032,7 @@ namespace Microsoft.PowerShell.Commands
return result.ToString();
}
private const string SectionSeparator = @"
##############################################################################
";
private const string SectionSeparator = "\r\n##############################################################################\r\n";
private void GenerateSectionSeparator(TextWriter writer)
{
@@ -2080,14 +2079,7 @@ namespace Microsoft.PowerShell.Commands
#region Generating header of a proxy module
private const string TopCommentTemplate = @"
<#
# {0}
# {1}
# {2}
# {3}
#>
";
private const string TopCommentTemplate = "\r\n<#\r\n # {0}\r\n # {1}\r\n # {2}\r\n # {3}\r\n #>\r\n";
private void GenerateTopComment(TextWriter writer)
{
@@ -2403,8 +2395,7 @@ function Get-PSImplicitRemotingSession
-ErrorAction SilentlyContinue )
}}
if (($script:PSSession -ne $null) -and ($script:PSSession.Runspace.RunspaceStateInfo.State -eq 'Disconnected'))
{{
# If we are handed a disconnected session, try re-connecting it before creating a new session.
{{ # If we are handed a disconnected session, try re-connecting it before creating a new session.
Set-PSImplicitRemotingSession `
(& $script:ConnectPSSession `
-Session $script:PSSession `
@@ -2856,12 +2847,7 @@ function Get-PSImplicitRemotingClientSideParameters
}}
Process {{ {6} }}
End {{ {7} }}
# .ForwardHelpTargetName {1}
# .ForwardHelpCategory {5}
# .RemoteHelpRunspace PSSession
}}
";
" + "\r\n # .ForwardHelpTargetName {1}\r\n # .ForwardHelpCategory {5}\r\n # .RemoteHelpRunspace PSSession\r\n}}\r\n ";
private void GenerateCommandProxy(TextWriter writer, CommandMetadata commandMetadata)
{
@@ -3157,3 +3143,4 @@ function Get-PSImplicitRemotingClientSideParameters
}
}
#endif
@@ -294,18 +294,11 @@ namespace Microsoft.PowerShell.Commands
}
CultureInfo currentCulture = culture;
StringBuilder stringBuilder;
string filePath;
string fullFileName = fileName + ".psd1";
while (currentCulture != null && !String.IsNullOrEmpty(currentCulture.Name))
{
stringBuilder = new StringBuilder(dir);
stringBuilder.Append("\\");
stringBuilder.Append(currentCulture.Name);
stringBuilder.Append("\\");
stringBuilder.Append(fileName);
stringBuilder.Append(".psd1");
filePath = stringBuilder.ToString();
filePath = Path.Combine(dir, currentCulture.Name, fullFileName);
if (File.Exists(filePath))
{
@@ -315,12 +308,7 @@ namespace Microsoft.PowerShell.Commands
currentCulture = currentCulture.Parent;
}
stringBuilder = new StringBuilder(dir);
stringBuilder.Append("\\");
stringBuilder.Append(fileName);
stringBuilder.Append(".psd1");
filePath = stringBuilder.ToString();
filePath = Path.Combine(dir, fullFileName);
if (File.Exists(filePath))
{
@@ -330,11 +318,11 @@ namespace Microsoft.PowerShell.Commands
InvalidOperationException ioe =
PSTraceSource.NewInvalidOperationException(
ImportLocalizedDataStrings.CannotFindPsd1File,
fileName + ".psd1",
dir + "\\" + culture.Name + "\\"
fullFileName,
Path.Combine(dir, culture.Name)
);
WriteError(new ErrorRecord(ioe, "ImportLocalizedData", ErrorCategory.ObjectNotFound,
dir + "\\" + culture.Name + "\\" + fileName + ".psd1"));
Path.Combine(dir, culture.Name, fullFileName)));
return null;
}
@@ -548,7 +548,7 @@ namespace Microsoft.PowerShell.Commands
// properties...
foreach (string p in Property)
{
MshExpression expression = new MshExpression(p);
MshExpression expression = new MshExpression(p, true);
List<MshExpression> resolvedNames = expression.ResolveNames(inObj);
if (resolvedNames == null || resolvedNames.Count == 0)
{
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -548,4 +549,5 @@ namespace Microsoft.PowerShell.Commands
}
#endregion
}
}
#endif
@@ -117,21 +117,28 @@ namespace Microsoft.PowerShell.Commands
if ( ShouldProcess( dateToUse.ToString() ) )
{
#pragma warning disable 56523
if (!NativeMethods.SetLocalTime(ref systemTime))
if (Platform.IsWindows())
{
throw new Win32Exception(Marshal.GetLastWin32Error());
}
#pragma warning disable 56523
// MSDN says to call this twice to account for changes
// between DST
if (!NativeMethods.SetLocalTime(ref systemTime))
if (!NativeMethods.SetLocalTime(ref systemTime))
{
throw new Win32Exception(Marshal.GetLastWin32Error());
}
// MSDN says to call this twice to account for changes
// between DST
if (!NativeMethods.SetLocalTime(ref systemTime))
{
throw new Win32Exception(Marshal.GetLastWin32Error());
}
#pragma warning restore 56523
}
else
{
throw new Win32Exception(Marshal.GetLastWin32Error());
Platform.NonWindowsSetDate(dateToUse);
}
#pragma warning restore 56523
}
//output DateTime object wrapped in an PSObject with DisplayHint attached
@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommand.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands
@@ -693,3 +694,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommandCommandInfo.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
@@ -152,4 +153,5 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
/// </summary>
public ICollection<ShowCommandParameterSetInfo> ParameterSets { get; private set; }
}
}
}
#endif
@@ -1,6 +1,7 @@
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommandModuleInfo.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
@@ -58,4 +59,5 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
/// </summary>
public string Name { get; private set; }
}
}
}
#endif
@@ -1,6 +1,7 @@
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommandParameterInfo.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
@@ -110,4 +111,5 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
/// </summary>
public int Position { get; private set; }
}
}
}
#endif
@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommandParameterSetInfo.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
@@ -74,4 +75,5 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
/// </summary>
public ICollection<ShowCommandParameterInfo> Parameters { get; private set; }
}
}
}
#endif
@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommandParameterInfo.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands.ShowCommandExtension
@@ -161,4 +162,5 @@ namespace Microsoft.PowerShell.Commands.ShowCommandExtension
/// </summary>
public ArrayList EnumValues { get; private set; }
}
}
}
#endif
@@ -1,6 +1,7 @@
//-----------------------------------------------------------------------
#if !CORECLR
//-----------------------------------------------------------------------
// <copyright file="ShowCommandProxy.cs" company="Microsoft">
// Copyright © Microsoft Corporation. All rights reserved.
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
//-----------------------------------------------------------------------
namespace Microsoft.PowerShell.Commands
@@ -195,3 +196,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -269,3 +270,5 @@ namespace Microsoft.PowerShell.Commands
#endregion Methods
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -206,3 +207,5 @@ namespace Microsoft.PowerShell.Commands
#endregion Internal Helper Methods
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -550,3 +551,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -16,7 +17,7 @@ namespace Microsoft.PowerShell.Commands
/// The Invoke-RestMethod command
/// This command makes an HTTP or HTTPS request to a web service,
/// and returns the response in an appropriate way.
/// Intended to work against the wide spectrum of “RESTful” web services
/// Intended to work against the wide spectrum of "RESTful" web services
/// currently deployed across the web.
/// </summary>
[Cmdlet(VerbsLifecycle.Invoke, "RestMethod", HelpUri = "http://go.microsoft.com/fwlink/?LinkID=217034")]
@@ -372,3 +373,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -61,3 +62,5 @@ namespace Microsoft.PowerShell.Commands
#endregion Virtual Method Overrides
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -27,3 +28,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -174,3 +175,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -492,3 +493,5 @@ namespace Microsoft.PowerShell.Commands
#endregion Static Methods
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -1356,3 +1357,5 @@ namespace Microsoft.PowerShell.Commands
#endregion private State class
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -98,3 +99,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -71,3 +72,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -190,3 +191,5 @@ namespace Microsoft.PowerShell.Commands
#endregion Methods
}
}
#endif
@@ -1,4 +1,5 @@
/********************************************************************++
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -38,3 +39,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -170,6 +170,11 @@ namespace Microsoft.PowerShell.Commands
// Expected if the host is not interactive, or doesn't have Foreground / Background
// colours.
}
catch (System.PlatformNotSupportedException)
{
// TODO:PSL Support setting these colors. Expected
// exception on non-windows CoreCLR for now.
}
this.WriteInformation(informationMessage, new string[] { "PSHOST" });
this.Host.UI.TranscribeResult(result);
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -623,3 +624,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -59,3 +60,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -144,3 +145,5 @@ namespace Microsoft.PowerShell.Commands
} // class PSHostTraceListener
} // namespace System.Management.Automation
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -186,3 +187,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -134,3 +135,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -573,3 +574,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -632,3 +633,5 @@ namespace Microsoft.PowerShell.Commands
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -214,3 +215,5 @@ namespace Microsoft.PowerShell.Commands
}
}
}
#endif
@@ -1,3 +1,4 @@
#if !CORECLR
/********************************************************************++
Copyright (c) Microsoft Corporation. All rights reserved.
--********************************************************************/
@@ -91,3 +92,5 @@ namespace Microsoft.PowerShell
}
}
}
#endif