1 files changed, 22 insertions, 35 deletions

diff --git a/src/wix/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs b/src/tools/WixToolset.HeatTasks/RefreshBundleGeneratedFile.cs
index 983695c9..8f1ad167 100644
--- a/src/wix/WixToolset.BuildTasks/RefreshBundleGeneratedFile.cs
+++ b/src/tools/WixToolset.HeatTasks/RefreshBundleGeneratedFile.cs
@@ -1,6 +1,6 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
 
-namespace WixToolset.BuildTasks
+namespace WixToolset.HeatTasks
 {
     using System;
     using System.Collections;
@@ -8,48 +8,35 @@ namespace WixToolset.BuildTasks
     using System.IO;
     using System.Xml;
     using Microsoft.Build.Framework;
-    using Microsoft.Build.Utilities;
 
     /// <summary>
     /// This task refreshes the generated file for bundle projects.
     /// </summary>
-    public class RefreshBundleGeneratedFile : Task
+    public class RefreshBundleGeneratedFile : RefreshTask
     {
         /// <summary>
-        /// The list of files to generate.
-        /// </summary>
-        [Required]
-        public ITaskItem[] GeneratedFiles { get; set; }
-
-        /// <summary>
-        /// All the project references in the project.
-        /// </summary>
-        [Required]
-        public ITaskItem[] ProjectReferencePaths { get; set; }
-
-        /// <summary>
         /// Gets a complete list of external cabs referenced by the given installer database file.
         /// </summary>
         /// <returns>True upon completion of the task execution.</returns>
         public override bool Execute()
         {
-            ArrayList payloadGroupRefs = new ArrayList();
-            ArrayList packageGroupRefs = new ArrayList();
-            for (int i = 0; i < this.ProjectReferencePaths.Length; i++)
+            var payloadGroupRefs = new ArrayList();
+            var packageGroupRefs = new ArrayList();
+            for (var i = 0; i < this.ProjectReferencePaths.Length; i++)
             {
-                ITaskItem item = this.ProjectReferencePaths[i];
+                var item = this.ProjectReferencePaths[i];
 
-                if (!String.IsNullOrEmpty(item.GetMetadata(ToolsCommon.DoNotHarvest)))
+                if (!String.IsNullOrEmpty(item.GetMetadata(DoNotHarvest)))
                 {
                     continue;
                 }
 
-                string projectPath = item.GetMetadata("MSBuildSourceProjectFile");
-                string projectName = Path.GetFileNameWithoutExtension(projectPath);
-                string referenceName = ToolsCommon.GetIdentifierFromName(ToolsCommon.GetMetadataOrDefault(item, "Name", projectName));
+                var projectPath = item.GetMetadata("MSBuildSourceProjectFile");
+                var projectName = Path.GetFileNameWithoutExtension(projectPath);
+                var referenceName = GetIdentifierFromName(GetMetadataOrDefault(item, "Name", projectName));
 
-                string[] pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
-                foreach (string pog in pogs)
+                var pogs = item.GetMetadata("RefProjectOutputGroups").Split(';');
+                foreach (var pog in pogs)
                 {
                     if (!String.IsNullOrEmpty(pog))
                     {
@@ -60,43 +47,43 @@ namespace WixToolset.BuildTasks
                 }
             }
 
-            XmlDocument doc = new XmlDocument();
+            var doc = new XmlDocument();
 
-            XmlProcessingInstruction head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
+            var head = doc.CreateProcessingInstruction("xml", "version='1.0' encoding='UTF-8'");
             doc.AppendChild(head);
 
-            XmlElement rootElement = doc.CreateElement("Wix");
+            var rootElement = doc.CreateElement("Wix");
             rootElement.SetAttribute("xmlns", "http://wixtoolset.org/schemas/v4/wxs");
             doc.AppendChild(rootElement);
 
-            XmlElement fragment = doc.CreateElement("Fragment");
+            var fragment = doc.CreateElement("Fragment");
             rootElement.AppendChild(fragment);
 
-            XmlElement payloadGroup = doc.CreateElement("PayloadGroup");
+            var payloadGroup = doc.CreateElement("PayloadGroup");
             payloadGroup.SetAttribute("Id", "Bundle.Generated.Payloads");
             fragment.AppendChild(payloadGroup);
 
-            XmlElement packageGroup = doc.CreateElement("PackageGroup");
+            var packageGroup = doc.CreateElement("PackageGroup");
             packageGroup.SetAttribute("Id", "Bundle.Generated.Packages");
             fragment.AppendChild(packageGroup);
 
             foreach (string payloadGroupRef in payloadGroupRefs)
             {
-                XmlElement payloadGroupRefElement = doc.CreateElement("PayloadGroupRef");
+                var payloadGroupRefElement = doc.CreateElement("PayloadGroupRef");
                 payloadGroupRefElement.SetAttribute("Id", payloadGroupRef);
                 payloadGroup.AppendChild(payloadGroupRefElement);
             }
 
             foreach (string packageGroupRef in packageGroupRefs)
             {
-                XmlElement packageGroupRefElement = doc.CreateElement("PackageGroupRef");
+                var packageGroupRefElement = doc.CreateElement("PackageGroupRef");
                 packageGroupRefElement.SetAttribute("Id", packageGroupRef);
                 packageGroup.AppendChild(packageGroupRefElement);
             }
 
-            foreach (ITaskItem item in this.GeneratedFiles)
+            foreach (var item in this.GeneratedFiles)
             {
-                string fullPath = item.GetMetadata("FullPath");
+                var fullPath = item.GetMetadata("FullPath");
 
                 payloadGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath) + ".Payloads");
                 packageGroup.SetAttribute("Id", Path.GetFileNameWithoutExtension(fullPath) + ".Packages");