From 0ff785170c06a8dfb42f2d4539215aa69cf53840 Mon Sep 17 00:00:00 2001 From: Rob Mensching Date: Sat, 12 Nov 2022 19:06:48 -0800 Subject: Fix typos in CreateItemAvoidingInference Fixes 7000 --- .../CreateItemAvoidingInference.cs | 23 ++++++++++------------ .../tools/WixToolset.Signing.targets | 4 ++-- 2 files changed, 12 insertions(+), 15 deletions(-) (limited to 'src') 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 { using System; using System.Collections.Generic; + using System.Linq; using Microsoft.Build.Framework; using Microsoft.Build.Utilities; /// - /// This task assigns Culture metadata to files based on the value of the Culture attribute on the - /// WixLocalization element inside the file. + /// This task creates items from properties without triggering the item creation inference + /// MSBuild targets will normally do. There are very specialized cases where this is used. /// public class CreateItemAvoidingInference : Task { /// - /// The properties to converty to items. + /// The properties to convert into items. /// [Required] public string InputProperties { get; set; } @@ -23,22 +24,18 @@ namespace WixToolset.BuildTasks /// The output items. /// [Output] - public ITaskItem[] OuputItems { get; private set; } + public ITaskItem[] OutputItems { get; private set; } /// - /// Gets a complete list of external cabs referenced by the given installer database file. + /// Convert the input properties into output items. /// /// True upon completion of the task execution. public override bool Execute() { - var newItems = new List(); - - foreach (var property in this.InputProperties.Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries)) - { - newItems.Add(new TaskItem(property)); - } - - this.OuputItems = newItems.ToArray(); + this.OutputItems = this.InputProperties + .Split(new char[] { ';' }, StringSplitOptions.RemoveEmptyEntries) + .Select(property => new TaskItem(property)) + .ToArray(); return true; } 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 @@ Inputs="@(SignTargetPath)" Outputs="$(SignedFilePath)"> - - + + -- cgit v1.2.3-55-g6feb