Skip to content

Commit 8c66aa3

Browse files
committed
fix substitution
1 parent 8dedc3e commit 8c66aa3

3 files changed

Lines changed: 11 additions & 5 deletions

File tree

Common.Build/Config/ProjectConfig.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ public class ProjectConfig
88
public required string Name { get; init; }
99
public required string? ArchiveSuffix { get; init; }
1010
public required string? OutputSubdirectory { get; init; }
11-
public required List<string> SubstitutionTargets { get; init; }
11+
public required List<string>? SubstitutionTargets { get; init; }
1212
}

Common.Build/Tasks/SubstituteTask.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ public class SubstituteTask : FrostingTask<BuildContext>
99
{
1010
private const string VersionPlaceholder = "12.34.56";
1111

12-
public override bool ShouldRun(BuildContext context) => !context.InternalConfig.SkipSubstitution && context.ProjectConfig.SubstitutionTargets.Count != 0;
12+
public override bool ShouldRun(BuildContext context) => !context.InternalConfig.SkipSubstitution && (context.ProjectConfig.SubstitutionTargets ?? []).Count != 0;
1313

1414
public override void Run(BuildContext context)
1515
{
16-
foreach (var substitutionTarget in context.ProjectConfig.SubstitutionTargets)
16+
foreach (var substitutionTarget in context.ProjectConfig.SubstitutionTargets ?? [])
1717
{
1818
var path = Path.Combine("..", context.InternalConfig.Project, substitutionTarget);
1919
if (!File.Exists(path))

schemas/config.schema.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@
5656
"minLength": 1
5757
},
5858
"substitutionTargets": {
59-
"type": "array",
59+
"type": [
60+
"array",
61+
"null"
62+
],
6063
"description": "A list of relative file paths to perform substitution on.",
6164
"items": {
6265
"type": "string",
@@ -68,7 +71,10 @@
6871
}
6972
},
7073
"substitutions": {
71-
"type": "object",
74+
"type": [
75+
"object",
76+
"null"
77+
],
7278
"description": "Key-value pairs of substitution to be performed, in addition to the built-in ones.",
7379
"additionalProperties": {
7480
"type": "string"

0 commit comments

Comments
 (0)