Skip to content

Remove Conditional Compilation and Runtime Checks for v3 or v4 #2150

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

Open
liamjpeters wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Remove Conditional Compilation and Runtime Checks for v3 or v4 #2150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b7ef03d
Remove conditional compilation gates using PSV3 and PSV4
liamjpeters Jan 12, 2026
3d8013a
Replace HashtableAst.SafeGetValue() compatibility shim with actual im…
liamjpeters Jan 12, 2026
f094f2f
Remove/simplify conditional checks which would would always be met wi…
liamjpeters Jan 12, 2026
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: 0 additions & 4 deletions Engine/Commands/InvokeScriptAnalyzerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ public object Settings

private bool stopProcessing;

#if !PSV3
/// <summary>
/// Resolve DSC resource dependency
/// </summary>
Expand All @@ -238,7 +237,6 @@ public SwitchParameter SaveDscDependency
set { saveDscDependency = value; }
}
private bool saveDscDependency;
#endif // !PSV3

#if DEBUG
/// <summary>
Expand Down Expand Up @@ -387,7 +385,6 @@ protected override void ProcessRecord()
ProcessPath();
}

#if !PSV3
// TODO Support dependency resolution for analyzing script definitions
if (saveDscDependency)
{
Expand All @@ -407,7 +404,6 @@ protected override void ProcessRecord()
}
return;
}
#endif
ProcessInput();
}

Expand Down
6 changes: 0 additions & 6 deletions Engine/FindAstPositionVisitor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,7 @@ namespace Microsoft.Windows.PowerShell.ScriptAnalyzer
/// <summary>
/// Provides an efficient way to find the position in the AST corresponding to a given script position.
/// </summary>
#if !(PSV3 || PSV4)
internal class FindAstPositionVisitor : AstVisitor2
#else
internal class FindAstPositionVisitor : AstVisitor
#endif
{
private IScriptPosition searchPosition;

Expand Down Expand Up @@ -300,7 +296,6 @@ public override AstVisitAction VisitWhileStatement(WhileStatementAst whileStatem
return Visit(whileStatementAst);
}

#if !(PSV3 || PSV4)
public override AstVisitAction VisitBaseCtorInvokeMemberExpression(BaseCtorInvokeMemberExpressionAst baseCtorInvokeMemberExpressionAst)
{
return Visit(baseCtorInvokeMemberExpressionAst);
Expand Down Expand Up @@ -335,7 +330,6 @@ public override AstVisitAction VisitUsingStatement(UsingStatementAst usingStatem
{
return AstVisitAction.Continue;
}
#endif

#if !(NET462 || PSV7) // net462 includes V3,4,5
public override AstVisitAction VisitPipelineChain(PipelineChainAst pipelineChainAst)
Expand Down
4 changes: 0 additions & 4 deletions Engine/Generic/IDSCResourceRule.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,6 @@ public interface IDSCResourceRule : IRule
/// <returns>The results of the analysis</returns>
IEnumerable<DiagnosticRecord> AnalyzeDSCResource(Ast ast, string fileName);

#if !PSV3

/// <summary>
/// Analyze dsc classes (if any) in the file
/// </summary>
Expand All @@ -29,7 +27,5 @@ public interface IDSCResourceRule : IRule
/// <returns></returns>
IEnumerable<DiagnosticRecord> AnalyzeDSCClass(Ast ast, string fileName);

#endif

}
}
4 changes: 1 addition & 3 deletions Engine/Generic/ModuleDependencyHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

#if !PSV3
using System;
using System.Collections.Generic;
using System.IO;
Expand Down Expand Up @@ -519,5 +518,4 @@ public void Dispose()

#endregion Public Methods
}
}
#endif // !PSV3
}
2 changes: 0 additions & 2 deletions Engine/Generic/RuleSuppression.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,12 +333,10 @@ public static List<RuleSuppression> GetSuppressions(IEnumerable<AttributeAst> at
{
targetAsts = scopeAst.FindAll(ast => ast is FunctionDefinitionAst && reg.IsMatch((ast as FunctionDefinitionAst).Name), true);
}
#if !(PSV3 || PSV4)
else if (scope.Equals("class", StringComparison.OrdinalIgnoreCase))
{
targetAsts = scopeAst.FindAll(ast => ast is TypeDefinitionAst && reg.IsMatch((ast as TypeDefinitionAst).Name), true);
}
#endif

if (targetAsts != null)
{
Expand Down
Loading