- Issue #137: Add custom attribute to Bundle project (Bootstrapper)

Author: oleg-shilo

Source/src/WixSharp.Samples/Wix# Samples/Bootstrapper/WixBootstrapper/setup.cs

@@ -45,8 +45,17 @@ static public void Main(string[] args)
 
                     //msiOnlinePackage, //just a demo sample
 
-                    new MsiPackage(crtMsi) { DisplayInternalUI = true, Visible = true, MsiProperties = "PACKAGE_PROPERTY=[BundleVariable]" },
-                    new MsiPackage(productMsi) { DisplayInternalUI = true, Payloads = new[] { "script.dll".ToPayload() } });
+                    new MsiPackage(crtMsi)
+                    {
+                        DisplayInternalUI = true,
+                        Visible = true,
+                        MsiProperties = "PACKAGE_PROPERTY=[BundleVariable]"
+                    },
+                    new MsiPackage(productMsi)
+                    {
+                        DisplayInternalUI = true,
+                        Payloads = new[] { "script.dll".ToPayload() }
+                    });
 
         bootstrapper.AboutUrl = "https://github.com/oleg-shilo/wixsharp/";
         bootstrapper.IconFile = "app_icon.ico";
@@ -67,11 +76,13 @@ static public void Main(string[] args)
         // bootstrapper.Application.LicensePath = null; //HyperlinkLicense app with no license
 
         bootstrapper.Application.AttributesDefinition = "ShowVersion=yes; ShowFilesInUse=yes";
-        // bootstrapper.Application.Bo
         bootstrapper.Include(WixExtension.Util);
 
+        bootstrapper.IncludeWixExtension(@"WixDependencyExtension.dll", "dep", "http://schemas.microsoft.com/wix/DependencyExtension");
+        bootstrapper.AttributesDefinition = "{dep}ProviderKey=01234567-8901-2345-6789-012345678901";
+
         // The code below sets WiX variables 'Netfx4FullVersion' and 'AdobeInstalled'. Note it has no affect on
-        //the runtime behavior and 'FileSearch' and "RegistrySearch" are only provided as an example.
+        //the runtime behaviour and 'FileSearch' and "RegistrySearch" are only provided as an example.
         bootstrapper.AddWixFragment("Wix/Bundle",
                                      new UtilRegistrySearch
                                      {

Source/src/WixSharp/AutoElements.cs

@@ -421,7 +421,7 @@ static void InjectPlatformAttributes(XDocument doc)
             }
         }
 
-        static void ExpandCustomAttributes(XDocument doc, Project project)
+        internal static void ExpandCustomAttributes(XDocument doc, WixProject project)
         {
             foreach (XAttribute instructionAttr in doc.Root.Descendants().Select(x => x.Attribute("WixSharpCustomAttributes")).Where(x => x != null))
             {
@@ -438,9 +438,9 @@ static void ExpandCustomAttributes(XDocument doc, Project project)
             }
         }
 
-        static Func<XElement, string, Project, bool> ExpandCustomAttribute = DefaultExpandCustomAttribute;
+        static Func<XElement, string, WixProject, bool> ExpandCustomAttribute = DefaultExpandCustomAttribute;
 
-        static bool DefaultExpandCustomAttribute(XElement source, string item, Project project)
+        static bool DefaultExpandCustomAttribute(XElement source, string item, WixProject project)
         {
             var attrParts = item.Split('=');
             // {dep}ProductKey=12345 vs Component:{dep}ProductKey=12345

Source/src/WixSharp/Compiler.Bootstrapper.cs

@@ -275,6 +275,9 @@ public static string BuildWxs(Bundle project)
                         AutoElements.NormalizeFilePaths(doc, project.SourceBaseDir, EmitRelativePaths);
 
                         project.InvokeWixSourceGenerated(doc);
+
+                        AutoElements.ExpandCustomAttributes(doc, project);
+
                         if (WixSourceGenerated != null)
                             WixSourceGenerated(doc);