Skip to content

Cleanup workflow code #9638

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 16 commits into from
Jul 6, 2019
Merged

Cleanup workflow code #9638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
a7eb9af
Remove WorkFlowInfo type
iSazonov May 21, 2019
cc8528a
Remove condition for UseSharedProcess
iSazonov May 21, 2019
7584eba
Remove PSWorkflowJob condition
iSazonov May 21, 2019
6c41dfd
Remove workflow from ValidateSet
iSazonov May 21, 2019
db4689e
Remove workflow from CommandTypes enum
iSazonov May 21, 2019
7dc30ee
Remove workflow from EventManager
iSazonov May 21, 2019
71b2ca6
Remove workflow from Get-Help
iSazonov May 21, 2019
dfabb6c
Remove WorkflowFileExtension ".xaml" from ModuleIntrinsics
iSazonov May 21, 2019
2139fe8
Remove WorkflowFileExtension ".xaml" from ModuleCmdletBase
iSazonov May 21, 2019
f3dc8a1
Remove workflow from PSModuleInfo
iSazonov May 21, 2019
859e2df
Remove workflow from CustomShellCommands
iSazonov May 21, 2019
5fefed6
Remove workflow from InitialSessionStateProvider
iSazonov May 21, 2019
34af4a5
Remove WriteWorkflowDebugNotSupportedError()
iSazonov May 21, 2019
03473f9
Remove unneeded resource strings from Module.cs
iSazonov May 21, 2019
e5a2043
Remove xaml from valid extension list
iSazonov Jun 21, 2019
a3a90e7
Fix null reference
iSazonov Jun 21, 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
1 change: 0 additions & 1 deletion src/Microsoft.PowerShell.Commands.Utility/commands/utility/ImplicitRemotingCommands.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,7 +1372,6 @@ private int GetCommandTypePriority(CommandTypes commandType)
case CommandTypes.Filter:
case CommandTypes.Function:
case CommandTypes.Script:
case CommandTypes.Workflow:
return 20;

case CommandTypes.Cmdlet:
Expand Down
7 changes: 1 addition & 6 deletions src/System.Management.Automation/engine/CommandInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ public enum CommandTypes
/// </summary>
Script = 0x0040,

/// <summary>
/// A workflow.
/// </summary>
Workflow = 0x0080,

/// <summary>
/// A Configuration.
/// </summary>
Expand All @@ -87,7 +82,7 @@ public enum CommandTypes
/// Note, a CommandInfo instance will never specify
/// All as its CommandType but All can be used when filtering the CommandTypes.
/// </remarks>
All = Alias | Function | Filter | Cmdlet | Script | ExternalScript | Application | Workflow | Configuration,
All = Alias | Function | Filter | Cmdlet | Script | ExternalScript | Application | Configuration,
}

/// <summary>
Expand Down
5 changes: 0 additions & 5 deletions src/System.Management.Automation/engine/EventManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,11 +1852,6 @@ private PSEngineEvent() { }
/// </summary>
public const string OnIdle = "PowerShell.OnIdle";

/// <summary>
/// Called when a workflow job is started from a PowerShell script.
/// </summary>
public const string WorkflowJobStartEvent = "PowerShell.WorkflowJobStartEvent";

/// <summary>
/// Called during scriptblock invocation.
/// </summary>
Expand Down
2 changes: 1 addition & 1 deletion src/System.Management.Automation/engine/InitialSessionState.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4119,7 +4119,7 @@ .FORWARDHELPCATEGORY Cmdlet
[string]
${Path},

[ValidateSet('Alias','Cmdlet','Provider','General','FAQ','Glossary','HelpFile','ScriptCommand','Function','Filter','ExternalScript','All','DefaultHelp','Workflow','DscResource','Class','Configuration')]
[ValidateSet('Alias','Cmdlet','Provider','General','FAQ','Glossary','HelpFile','ScriptCommand','Function','Filter','ExternalScript','All','DefaultHelp','DscResource','Class','Configuration')]
[string[]]
${Category},

Expand Down
74 changes: 5 additions & 69 deletions src/System.Management.Automation/engine/Modules/ModuleCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,9 +666,9 @@ private PSModuleInfo LoadModuleNamedInManifest(PSModuleInfo parentModule, Module
Modules.ManifestMemberNotValid,
moduleSpecification.Name,
"NestedModules",
parentModule.Path,
parentModule?.Path,
StringUtil.Format(Modules.InvalidModuleExtension, extension, moduleSpecification.Name),
ModuleIntrinsics.GetModuleName(parentModule.Path));
ModuleIntrinsics.GetModuleName(parentModule?.Path));
invalidOperation.SetErrorId("Modules_InvalidModuleExtension");
throw invalidOperation;
}
Expand Down Expand Up @@ -1539,40 +1539,6 @@ internal PSModuleInfo LoadModuleManifest(

string actualRootModule = moduleToProcess ?? rootModule;

// If the root module is a workflow module, the 'actualRootModule' is nulled out.
// We need to save this name so that we can assign this to the RootModule property of ModuleInfo.
string savedActualRootModule = actualRootModule;

if (string.Equals(System.IO.Path.GetExtension(actualRootModule),
StringLiterals.WorkflowFileExtension, StringComparison.OrdinalIgnoreCase))
{
if (WildcardPattern.ContainsWildcardCharacters(actualRootModule))
{
PSInvalidOperationException invalidOperation = PSTraceSource.NewInvalidOperationException(
Modules.WildCardNotAllowedInModuleToProcessAndInNestedModules,
moduleManifestPath);
invalidOperation.SetErrorId("Modules_WildCardNotAllowedInModuleToProcessAndInNestedModules");
throw invalidOperation;
}

if (writingErrors)
{
message = StringUtil.Format(Modules.WorkflowModuleNotSupported, actualRootModule);
WriteError(new ErrorRecord(
new NotSupportedException(message),
"Modules_WorkflowModuleNotSupported",
ErrorCategory.InvalidOperation, null));
}

// Null out 'actualRootModule' so don't attempt to process the file like a non-workflow module later.
actualRootModule = null;
containedErrors = true;
if (bailOnFirstError)
{
return null;
}
}

// extract defaultCommandPrefix from the manifest
string defaultCommandPrefix = null;
if (
Expand Down Expand Up @@ -2013,28 +1979,7 @@ internal PSModuleInfo LoadModuleManifest(
throw invalidOperation;
}

if (string.Equals(System.IO.Path.GetExtension(s.Name),
StringLiterals.WorkflowFileExtension, StringComparison.OrdinalIgnoreCase))
{
if (writingErrors)
{
message = StringUtil.Format(Modules.WorkflowModuleNotSupported, s.Name);
WriteError(new ErrorRecord(
new NotSupportedException(message),
"Modules_WorkflowModuleNotSupported",
ErrorCategory.InvalidOperation, null));
}

containedErrors = true;
if (bailOnFirstError)
{
return null;
}
}
else
{
nestedModules.Add(s);
}
nestedModules.Add(s);
}

Array.Clear(tmpNestedModules, 0, tmpNestedModules.Length);
Expand Down Expand Up @@ -2593,8 +2538,8 @@ internal PSModuleInfo LoadModuleManifest(
}
}

manifestInfo.RootModule = savedActualRootModule;
manifestInfo.RootModuleForManifest = savedActualRootModule;
manifestInfo.RootModule = actualRootModule;
manifestInfo.RootModuleForManifest = actualRootModule;
if (manifestGuid != null)
{
manifestInfo.SetGuid((Guid)manifestGuid);
Expand Down Expand Up @@ -5918,15 +5863,6 @@ internal PSModuleInfo LoadModule(PSModuleInfo parentModule, string fileName, str
}
}
}
else if (ext.Equals(StringLiterals.WorkflowFileExtension, StringComparison.OrdinalIgnoreCase))
{
found = true;
message = StringUtil.Format(Modules.WorkflowModuleNotSupported, fileName);
WriteError(new ErrorRecord(
new NotSupportedException(message),
"Modules_WorkflowModuleNotSupported",
ErrorCategory.InvalidOperation, null));
}
else
{
found = true;
Expand Down
2 changes: 0 additions & 2 deletions src/System.Management.Automation/engine/Modules/ModuleIntrinsics.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -899,7 +899,6 @@ internal static ExperimentalFeature[] GetExperimentalFeature(string manifestPath
StringLiterals.PowerShellScriptFileExtension,
StringLiterals.PowerShellModuleFileExtension,
StringLiterals.PowerShellCmdletizationFileExtension,
StringLiterals.WorkflowFileExtension,
StringLiterals.PowerShellNgenAssemblyExtension,
StringLiterals.PowerShellILAssemblyExtension,
StringLiterals.PowerShellILExecutableExtension,
Expand All @@ -910,7 +909,6 @@ internal static ExperimentalFeature[] GetExperimentalFeature(string manifestPath
StringLiterals.PowerShellDataFileExtension,
StringLiterals.PowerShellModuleFileExtension,
StringLiterals.PowerShellCmdletizationFileExtension,
StringLiterals.WorkflowFileExtension,
StringLiterals.PowerShellNgenAssemblyExtension,
StringLiterals.PowerShellILAssemblyExtension,
StringLiterals.PowerShellILExecutableExtension,
Expand Down
15 changes: 0 additions & 15 deletions src/System.Management.Automation/engine/Modules/PSModuleInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1205,17 +1205,6 @@ internal void AddDetectedAliasExport(string name, string value)
DetectedAliasExports[name] = value;
}

/// <summary>
/// Lists the workflows exported by this module.
/// </summary>
public Dictionary<string, FunctionInfo> ExportedWorkflows
{
get
{
return new Dictionary<string, FunctionInfo>(StringComparer.OrdinalIgnoreCase);
}
}

/// <summary>
/// </summary>
public ReadOnlyCollection<string> ExportedDscResources
Expand Down Expand Up @@ -1582,10 +1571,6 @@ public enum ModuleType
/// Indicates that this is cmdlets-over-objects module (a powershell file with a .CDXML extension)
/// </summary>
Cim,
/// <summary>
/// Indicates that this is workflow module (a powershell file with a .XAML extension)
/// </summary>
Workflow,
}

/// <summary>
Expand Down
5 changes: 0 additions & 5 deletions src/System.Management.Automation/engine/SessionStateStrings.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@ internal static class StringLiterals
/// </summary>
internal const string PowerShellDataFileExtension = ".psd1";

/// <summary>
/// The file extension (including the dot) of an workflow file.
/// </summary>
internal const string WorkflowFileExtension = ".xaml";

/// <summary>
/// The file extension (including the dot) of an workflow dependent assembly.
/// </summary>
Expand Down
Loading