Skip to content

Cleanup workflow - remove PSProxyJob #10083

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
iSazonov merged 2 commits into from
Jul 12, 2019
Merged

Cleanup workflow - remove PSProxyJob #10083

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
55ec33d
Cleanup workflow - remove PSProxyJob
iSazonov Jul 9, 2019
eb9f763
Fix test
iSazonov Jul 9, 2019
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
72 changes: 0 additions & 72 deletions src/System.Management.Automation/engine/hostifaces/PowerShell.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3896,29 +3896,6 @@ private void ResetOutputBufferAsNeeded()
}
}

/// <summary>
/// This has been added as a work around for Windows8 bug 803461.
/// It should be used only for the PSJobProxy API.
///
/// Resets the instance ID of the command to a new guid.
/// If this is not done, then there is a race condition on the server
/// in the following circumstances:
///
/// ps.BeginInvoke(...);
/// ps.Stop()
/// ps.Commands.Clear();
/// ps.AddCommand("Foo");
/// ps.Invoke();
///
/// In these conditions, stop returns before the server is done cleaning up.
/// The subsequent invoke will cause an error because the guid already
/// identifies a command in progress.
/// </summary>
internal void GenerateNewInstanceId()
{
InstanceId = Guid.NewGuid();
}

/// <summary>
/// Get a steppable pipeline object.
/// </summary>
Expand Down Expand Up @@ -5935,55 +5912,6 @@ internal void WaitForServicingComplete()

#endregion

#region V3 Extensions

/// <summary>
/// Returns a job object which can be used to
/// control the invocation of the command with
/// AsJob Parameter.
/// </summary>
/// <returns>Job object.</returns>
public PSJobProxy AsJobProxy()
{
// if there are no commands added
// throw an invalid operation exception
if (this.Commands.Commands.Count == 0)
{
throw PSTraceSource.NewInvalidOperationException(PowerShellStrings.GetJobForCommandRequiresACommand);
}

// if there is more than one command in the
// command collection throw an error
if (this.Commands.Commands.Count > 1)
{
throw PSTraceSource.NewInvalidOperationException(PowerShellStrings.GetJobForCommandNotSupported);
}

// check if the AsJob parameter has already
// been added. If not, add the same
bool found = false;
foreach (CommandParameter parameter in this.Commands.Commands[0].Parameters)
{
if (string.Compare(parameter.Name, "AsJob", StringComparison.OrdinalIgnoreCase) == 0)
{
found = true;
}
}

if (!found)
{
AddParameter("AsJob");
}

// initialize the job invoker and return the same
PSJobProxy job = new PSJobProxy(this.Commands.Commands[0].CommandText);
job.InitializeJobProxy(this.Commands, this.Runspace, this.RunspacePool);

return job;
}

#endregion V3 Extensions

#if !CORECLR // PSMI Not Supported On CSS
#region Win Blue Extensions

Expand Down
Loading