diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-11-12 19:06:48 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-11-13 07:27:49 -0800 |
| commit | 0ff785170c06a8dfb42f2d4539215aa69cf53840 (patch) | |
| tree | e8a465ef5215d58cef6663980fd78e53dbad45ab /src | |
| parent | c8a832c931f6c34892e596a11c14e9181d5eee16 (diff) | |
| download | wix-0ff785170c06a8dfb42f2d4539215aa69cf53840.tar.gz wix-0ff785170c06a8dfb42f2d4539215aa69cf53840.tar.bz2 wix-0ff785170c06a8dfb42f2d4539215aa69cf53840.zip | |
Fix typos in CreateItemAvoidingInference
Fixes 7000
Diffstat (limited to 'src')
| -rw-r--r-- | src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs | 23 | ||||
| -rw-r--r-- | src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets | 4 |
2 files changed, 12 insertions, 15 deletions
diff --git a/src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs b/src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs index 3441bd85..6280395a 100644 --- a/src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs +++ b/src/wix/WixToolset.BuildTasks/CreateItemAvoidingInference.cs | |||
| @@ -4,17 +4,18 @@ namespace WixToolset.BuildTasks | |||
| 4 | { | 4 | { |
| 5 | using System; | 5 | using System; |
| 6 | using System.Collections.Generic; | 6 | using System.Collections.Generic; |
| 7 | using System.Linq; | ||
| 7 | using Microsoft.Build.Framework; | 8 | using Microsoft.Build.Framework; |
| 8 | using Microsoft.Build.Utilities; | 9 | using Microsoft.Build.Utilities; |
| 9 | 10 | ||
| 10 | /// <summary> | 11 | /// <summary> |
| 11 | /// This task assigns Culture metadata to files based on the value of the Culture attribute on the | 12 | /// This task creates items from properties without triggering the item creation inference |
| 12 | /// WixLocalization element inside the file. | 13 | /// MSBuild targets will normally do. There are very specialized cases where this is used. |
| 13 | /// </summary> | 14 | /// </summary> |
| 14 | public class CreateItemAvoidingInference : Task | 15 | public class CreateItemAvoidingInference : Task |
| 15 | { | 16 | { |
| 16 | /// <summary> | 17 | /// <summary> |
| 17 | /// The properties to converty to items. | 18 | /// The properties to convert into items. |
| 18 | /// </summary> | 19 | /// </summary> |
| 19 | [Required] | 20 | [Required] |
| 20 | public string InputProperties { get; set; } | 21 | public string InputProperties { get; set; } |
| @@ -23,22 +24,18 @@ namespace WixToolset.BuildTasks | |||
| 23 | /// The output items. | 24 | /// The output items. |
| 24 | /// </summary> | 25 | /// </summary> |
| 25 | [Output] | 26 | [Output] |
| 26 | public ITaskItem[] OuputItems { get; private set; } | 27 | public ITaskItem[] OutputItems { get; private set; } |
| 27 | 28 | ||
| 28 | /// <summary> | 29 | /// <summary> |
| 29 | /// Gets a complete list of external cabs referenced by the given installer database file. | 30 | /// Convert the input properties into output items. |
| 30 | /// </summary> | 31 | /// </summary> |
| 31 | /// <returns>True upon completion of the task execution.</returns> | 32 | /// <returns>True upon completion of the task execution.</returns> |
| 32 | public override bool Execute() | 33 | public override bool Execute() |
| 33 | { | 34 | { |
| 34 | var newItems = new List<ITaskItem>(); | 35 | this.OutputItems = this.InputProperties |
| 35 | 36 | .Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries) | |
| 36 | foreach (var property in this.InputProperties.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) | 37 | .Select(property => new TaskItem(property)) |
| 37 | { | 38 | .ToArray(); |
| 38 | newItems.Add(new TaskItem(property)); | ||
| 39 | } | ||
| 40 | |||
| 41 | this.OuputItems = newItems.ToArray(); | ||
| 42 | 39 | ||
| 43 | return true; | 40 | return true; |
| 44 | } | 41 | } |
diff --git a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets index a575181a..8b850fd7 100644 --- a/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets +++ b/src/wix/WixToolset.Sdk/tools/WixToolset.Signing.targets | |||
| @@ -141,8 +141,8 @@ | |||
| 141 | Inputs="@(SignTargetPath)" | 141 | Inputs="@(SignTargetPath)" |
| 142 | Outputs="$(SignedFilePath)"> | 142 | Outputs="$(SignedFilePath)"> |
| 143 | <CreateItemAvoidingInference InputProperties="@(SignTargetPath)"> | 143 | <CreateItemAvoidingInference InputProperties="@(SignTargetPath)"> |
| 144 | <Output TaskParameter="OuputItems" ItemName="SignMsi" /> | 144 | <Output TaskParameter="OutputItems" ItemName="SignMsi" /> |
| 145 | <Output TaskParameter="OuputItems" ItemName="FileWrites" /> | 145 | <Output TaskParameter="OutputItems" ItemName="FileWrites" /> |
| 146 | </CreateItemAvoidingInference> | 146 | </CreateItemAvoidingInference> |
| 147 | </Target> | 147 | </Target> |
| 148 | 148 | ||
