diff --git a/src/Microsoft.TemplateEngine.Abstractions/PrecedenceDefinition.cs b/src/Microsoft.TemplateEngine.Abstractions/PrecedenceDefinition.cs
index 696d4b59529..7a4468d9319 100644
--- a/src/Microsoft.TemplateEngine.Abstractions/PrecedenceDefinition.cs
+++ b/src/Microsoft.TemplateEngine.Abstractions/PrecedenceDefinition.cs
@@ -19,7 +19,7 @@ public enum PrecedenceDefinition
///
/// Set if and only if only the IsRequiredCondition is set.
///
- ConditionalyRequired,
+ ConditionallyRequired,
///
/// Parameter value is not required from user.
@@ -34,7 +34,7 @@ public enum PrecedenceDefinition
///
/// Parameter might become disabled - value would not be needed nor used in such case.
///
- ConditionalyDisabled,
+ ConditionallyDisabled,
///
/// Parameter is disabled - it's value is not required and will not be used.
diff --git a/src/Microsoft.TemplateEngine.Abstractions/PublicAPI.Shipped.txt b/src/Microsoft.TemplateEngine.Abstractions/PublicAPI.Shipped.txt
index 83281993f10..ffda60a16a3 100644
--- a/src/Microsoft.TemplateEngine.Abstractions/PublicAPI.Shipped.txt
+++ b/src/Microsoft.TemplateEngine.Abstractions/PublicAPI.Shipped.txt
@@ -414,8 +414,8 @@ Microsoft.TemplateEngine.Abstractions.ITemplate.Generator.get -> Microsoft.Templ
Microsoft.TemplateEngine.Abstractions.ITemplate.LocaleConfiguration.get -> Microsoft.TemplateEngine.Abstractions.Mount.IFileSystemInfo?
Microsoft.TemplateEngine.Abstractions.ITemplateParameter.AllowMultipleValues.get -> bool
Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
-Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.ConditionalyDisabled = 4 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
-Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.ConditionalyRequired = 1 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
+Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.ConditionallyDisabled = 4 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
+Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.ConditionallyRequired = 1 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.Disabled = 5 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.Implicit = 3 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition.Optional = 2 -> Microsoft.TemplateEngine.Abstractions.PrecedenceDefinition
diff --git a/src/Microsoft.TemplateEngine.Abstractions/TemplateParameterPrecedence.cs b/src/Microsoft.TemplateEngine.Abstractions/TemplateParameterPrecedence.cs
index e7c2e35f023..3ee2ddb8576 100644
--- a/src/Microsoft.TemplateEngine.Abstractions/TemplateParameterPrecedence.cs
+++ b/src/Microsoft.TemplateEngine.Abstractions/TemplateParameterPrecedence.cs
@@ -66,11 +66,11 @@ private void VerifyConditions()
// If enable condition is set - parameter is conditionally disabled (regardless if require condition is set or not)
// Conditionally required is if and only if the only require condition is set
- if (!(string.IsNullOrEmpty(IsRequiredCondition) ^ PrecedenceDefinition == PrecedenceDefinition.ConditionalyRequired
+ if (!(string.IsNullOrEmpty(IsRequiredCondition) ^ PrecedenceDefinition == PrecedenceDefinition.ConditionallyRequired
||
- !string.IsNullOrEmpty(IsEnabledCondition) ^ PrecedenceDefinition == PrecedenceDefinition.ConditionalyDisabled)
+ !string.IsNullOrEmpty(IsEnabledCondition) ^ PrecedenceDefinition == PrecedenceDefinition.ConditionallyDisabled)
&&
- !(!string.IsNullOrEmpty(IsRequiredCondition) && !string.IsNullOrEmpty(IsEnabledCondition) && PrecedenceDefinition == PrecedenceDefinition.ConditionalyDisabled))
+ !(!string.IsNullOrEmpty(IsRequiredCondition) && !string.IsNullOrEmpty(IsEnabledCondition) && PrecedenceDefinition == PrecedenceDefinition.ConditionallyDisabled))
{
// TODO: localize
throw new ArgumentException("Mismatched precedence definition");
diff --git a/src/Microsoft.TemplateEngine.Edge/Template/InputDataSetExtensions.cs b/src/Microsoft.TemplateEngine.Edge/Template/InputDataSetExtensions.cs
index 37b2e7f2ea5..664fdd07ddd 100644
--- a/src/Microsoft.TemplateEngine.Edge/Template/InputDataSetExtensions.cs
+++ b/src/Microsoft.TemplateEngine.Edge/Template/InputDataSetExtensions.cs
@@ -61,10 +61,10 @@ public static EvaluatedPrecedence GetEvaluatedPrecedence(this InputParameterData
{
PrecedenceDefinition.Required => EvaluatedPrecedence.Required,
// Conditionally required state is only set if enabled condition is not present
- PrecedenceDefinition.ConditionalyRequired => dt!.IsRequiredConditionResult!.Value ? EvaluatedPrecedence.Required : EvaluatedPrecedence.Optional,
+ PrecedenceDefinition.ConditionallyRequired => dt!.IsRequiredConditionResult!.Value ? EvaluatedPrecedence.Required : EvaluatedPrecedence.Optional,
PrecedenceDefinition.Optional => EvaluatedPrecedence.Optional,
PrecedenceDefinition.Implicit => EvaluatedPrecedence.Implicit,
- PrecedenceDefinition.ConditionalyDisabled => !dt!.IsEnabledConditionResult!.Value
+ PrecedenceDefinition.ConditionallyDisabled => !dt!.IsEnabledConditionResult!.Value
? EvaluatedPrecedence.Disabled
:
(dt.IsRequiredConditionResult.HasValue && dt.IsRequiredConditionResult.Value) || dt.ParameterDefinition.Precedence.IsRequired
diff --git a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs
index 4127cec846a..c390183f661 100644
--- a/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs
+++ b/src/Microsoft.TemplateEngine.Orchestrator.RunnableProjects/ConfigModel/ParameterSymbol.cs
@@ -221,7 +221,7 @@ private static TemplateParameterPrecedence GetPrecedence(bool isRequired, bool i
if (!string.IsNullOrEmpty(isEnabledCondition))
{
- return new TemplateParameterPrecedence(PrecedenceDefinition.ConditionalyDisabled, isRequiredCondition, isEnabledCondition, isRequired);
+ return new TemplateParameterPrecedence(PrecedenceDefinition.ConditionallyDisabled, isRequiredCondition, isEnabledCondition, isRequired);
}
if (isTag)
@@ -231,7 +231,7 @@ private static TemplateParameterPrecedence GetPrecedence(bool isRequired, bool i
if (!string.IsNullOrEmpty(isRequiredCondition))
{
- return new TemplateParameterPrecedence(PrecedenceDefinition.ConditionalyRequired, isRequiredCondition, null);
+ return new TemplateParameterPrecedence(PrecedenceDefinition.ConditionallyRequired, isRequiredCondition, null);
}
if (isRequired)
diff --git a/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateCacheTests.cs b/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateCacheTests.cs
index a9ff5989b6d..b84054bfaef 100644
--- a/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateCacheTests.cs
+++ b/test/Microsoft.TemplateEngine.Edge.UnitTests/TemplateCacheTests.cs
@@ -148,7 +148,7 @@ public void CanHandleParameters()
SettingsFilePaths paths = new SettingsFilePaths(environmentSettings);
ITemplateParameter param1 = new TemplateParameter("param1", "parameter", "string");
- ITemplateParameter param2 = new TemplateParameter("param2", "parameter", "string", new TemplateParameterPrecedence(PrecedenceDefinition.ConditionalyRequired, isRequiredCondition: "param1 == \"foo\""));
+ ITemplateParameter param2 = new TemplateParameter("param2", "parameter", "string", new TemplateParameterPrecedence(PrecedenceDefinition.ConditionallyRequired, isRequiredCondition: "param1 == \"foo\""));
ITemplateParameter param3 = new TemplateParameter(
"param3",
"parameter",