Skip to content

[pull] master from PowerShell:master #438

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
May 7, 2026
Merged

[pull] master from PowerShell:master #438

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/remoting/client/RemotingProtocol2.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1551,7 +1551,7 @@ private void HandleInputDataReady(object sender, EventArgs e)
/// <param name="inputstream"></param>
private void WriteInput(ObjectStreamBase inputstream)
{
Collection<object> inputObjects = inputstream.ObjectReader.NonBlockingRead(Int32.MaxValue);
Collection<object> inputObjects = inputstream.ObjectReader.NonBlockingRead(int.MaxValue);

foreach (object inputObject in inputObjects)
{
Expand All @@ -1562,7 +1562,7 @@ private void WriteInput(ObjectStreamBase inputstream)
if (!inputstream.IsOpen)
{
// Write any data written after the NonBlockingRead call above.
inputObjects = inputstream.ObjectReader.NonBlockingRead(Int32.MaxValue);
inputObjects = inputstream.ObjectReader.NonBlockingRead(int.MaxValue);

foreach (object inputObject in inputObjects)
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/commands/InvokeCommandCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ public override PSCredential Credential
[Parameter(ParameterSetName = InvokeCommandCommand.ComputerNameParameterSet)]
[Parameter(ParameterSetName = InvokeCommandCommand.FilePathComputerNameParameterSet)]
[Parameter(ParameterSetName = InvokeCommandCommand.SSHHostParameterSet)]
[ValidateRange((int)1, (int)UInt16.MaxValue)]
[ValidateRange((int)1, (int)ushort.MaxValue)]
public override int Port
{
get
Expand Down
4 changes: 2 additions & 2 deletions src/System.Management.Automation/engine/remoting/commands/PSRemotingCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ public virtual PSCredential Credential
/// </remarks>
[Parameter(ParameterSetName = PSRemotingBaseCmdlet.ComputerNameParameterSet)]
[Parameter(ParameterSetName = PSRemotingBaseCmdlet.SSHHostParameterSet)]
[ValidateRange((int)1, (int)UInt16.MaxValue)]
[ValidateRange((int)1, (int)ushort.MaxValue)]
public virtual int Port { get; set; }

/// <summary>
Expand Down Expand Up @@ -4149,7 +4149,7 @@ internal static string ExtractMessage(
try
{
// WinRM returns both signed and unsigned 32 bit string values. Convert to signed 32 bit integer.
Int64 eCode = Convert.ToInt64(errorCodeString, System.Globalization.NumberFormatInfo.InvariantInfo);
long eCode = Convert.ToInt64(errorCodeString, System.Globalization.NumberFormatInfo.InvariantInfo);
unchecked
{
errorCode = (int)eCode;
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/commands/StartJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,7 @@ public override string ConfigurationName
/// <summary>
/// Overriding to suppress this parameter.
/// </summary>
public override Int32 ThrottleLimit
public override int ThrottleLimit
{
get
{
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/commands/WaitJob.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public class WaitJobCommand : JobCmdletBase, IDisposable
/// </summary>
[Parameter]
[Alias("TimeoutSec")]
[ValidateRange(-1, Int32.MaxValue)]
[ValidateRange(-1, int.MaxValue)]
public int Timeout
{
get
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/remoting/commands/getrunspacecommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ public string CertificateThumbprint
/// </remarks>
[Parameter(ParameterSetName = GetPSSessionCommand.ComputerNameParameterSet)]
[Parameter(ParameterSetName = GetPSSessionCommand.ComputerInstanceIdParameterSet)]
[ValidateRange((int)1, (int)UInt16.MaxValue)]
[ValidateRange((int)1, (int)ushort.MaxValue)]
public int Port { get; set; }

/// <summary>
Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/engine/remoting/common/RunspaceConnectionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public int OpenTimeout
// The timer constructor will throw an exception
// for any value greater than Int32.MaxValue
// hence this is the maximum possible limit
_openTimeout = Int32.MaxValue;
_openTimeout = int.MaxValue;
}
}
}
Expand Down Expand Up @@ -270,7 +270,7 @@ public int OpenTimeout
/// The maximum allowed idle timeout duration (in ms) that can be set on a Runspace. This is a read-only property
/// that is set once the Runspace is successfully created and opened.
/// </summary>
public int MaxIdleTimeout { get; internal set; } = Int32.MaxValue;
public int MaxIdleTimeout { get; internal set; } = int.MaxValue;

/// <summary>
/// Populates session options from a PSSessionOption instance.
Expand Down Expand Up @@ -2505,7 +2505,7 @@ private static string[] ParseArgv(ProcessStartInfo psi)
var argvList = new List<string>();
argvList.Add(psi.FileName);

var argsToParse = String.Join(' ', psi.ArgumentList).Trim();
var argsToParse = string.Join(' ', psi.ArgumentList).Trim();
var argsLength = argsToParse.Length;
for (int i = 0; i < argsLength; )
{
Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/engine/remoting/common/fragmentor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,11 +757,11 @@ private void WriteCurrentFragmentAndReset()
PSEtwLog.LogAnalyticVerbose(
PSEventId.SentRemotingFragment, PSOpcode.Send, PSTask.None,
PSKeyword.Transport | PSKeyword.UseAlwaysAnalytic,
(Int64)(_currentFragment.ObjectId),
(Int64)(_currentFragment.FragmentId),
(long)(_currentFragment.ObjectId),
(long)(_currentFragment.FragmentId),
_currentFragment.IsStartFragment ? 1 : 0,
_currentFragment.IsEndFragment ? 1 : 0,
(UInt32)(_currentFragment.BlobLength),
(uint)(_currentFragment.BlobLength),
new PSETWBinaryBlob(_currentFragment.Blob, 0, _currentFragment.BlobLength));

// finally write into memory stream
Expand Down
12 changes: 6 additions & 6 deletions src/System.Management.Automation/engine/remoting/fanin/BaseTransportManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ public abstract class BaseTransportManager : IDisposable

// This value instructs the server to use whatever setting it has for idle timeout.
internal const int UseServerDefaultIdleTimeout = -1;
internal const uint UseServerDefaultIdleTimeoutUInt = UInt32.MaxValue;
internal const uint UseServerDefaultIdleTimeoutUInt = uint.MaxValue;

// Minimum allowed idle timeout time is 60 seconds.
internal const int MinimumIdleTimeout = 60 * 1000;
Expand Down Expand Up @@ -390,9 +390,9 @@ internal void OnDataAvailableCallback(RemoteDataObject<PSObject> remoteObject)
PSKeyword.Transport | PSKeyword.UseAlwaysAnalytic,
remoteObject.RunspacePoolId.ToString(),
remoteObject.PowerShellId.ToString(),
(UInt32)(remoteObject.Destination),
(UInt32)(remoteObject.DataType),
(UInt32)(remoteObject.TargetInterface));
(uint)(remoteObject.Destination),
(uint)(remoteObject.DataType),
(uint)(remoteObject.TargetInterface));

// This might throw exceptions which the caller handles.
PowerShellGuidObserver.SafeInvoke(remoteObject.PowerShellId, EventArgs.Empty);
Expand Down Expand Up @@ -1414,8 +1414,8 @@ private void OnDataAvailable(byte[] dataToSend, bool isEndFragment)
_runspacePoolInstanceId.ToString(),
_powerShellInstanceId.ToString(),
dataToSend.Length.ToString(CultureInfo.InvariantCulture),
(UInt32)_dataType,
(UInt32)_targetInterface);
(uint)_dataType,
(uint)_targetInterface);

SendDataToClient(dataToSend, isEndFragment && _shouldFlushData, _reportAsPending, isEndFragment);
}
Expand Down
6 changes: 3 additions & 3 deletions src/System.Management.Automation/engine/remoting/fanin/PriorityCollection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -561,11 +561,11 @@ internal void ProcessRawData(byte[] data, OnDataAvailableCallback callback)
PSEtwLog.LogAnalyticVerbose(
PSEventId.ReceivedRemotingFragment, PSOpcode.Receive, PSTask.None,
PSKeyword.Transport | PSKeyword.UseAlwaysAnalytic,
(Int64)objectId,
(Int64)fragmentId,
(long)objectId,
(long)fragmentId,
sFlag ? 1 : 0,
eFlag ? 1 : 0,
(UInt32)blobLength,
(uint)blobLength,
new PSETWBinaryBlob(oneFragment, FragmentedRemoteObject.HeaderLength, blobLength));

byte[] extraData = null;
Expand Down
Loading