- Issue #1046: ComponentCondition doesn't work for InternetShortcut

oleg-shilo · Sep 26, 2021 · c27a9ce · c27a9ce
1 parent 06aff03
commit c27a9ce
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Source/src/WixSharp/Extensions.cs b/Source/src/WixSharp/Extensions.cs
@@ -1629,7 +1629,7 @@ public static bool IsEmpty(this string s)
         /// <summary>
         /// Determines whether the given string is empty or not.
         /// </summary>
-        /// <param name="s">The string to analyse.</param>
+        /// <param name="s">The string to analyses.</param>
         /// <returns>
         /// 	<c>true</c> if the specified string is not empty; otherwise, <c>false</c>.
         /// </returns>

diff --git a/Source/src/WixSharp/WixEntity.cs b/Source/src/WixSharp/WixEntity.cs
@@ -104,15 +104,17 @@ public Dictionary<string, string> Attributes
         /// </example>
         public string AttributesDefinition { get; set; }
 
+        internal string HiddenAttributesDefinition;
+
         internal Dictionary<string, string> attributesBag = new Dictionary<string, string>();
 
         void ProcessAttributesDefinition()
         {
-            if (!AttributesDefinition.IsEmpty())
+            if (AttributesDefinition.IsNotEmpty() || HiddenAttributesDefinition.IsNotEmpty())
             {
                 try
                 {
-                    this.Attributes = AttributesDefinition.ToDictionary();
+                    this.Attributes = (AttributesDefinition + ";" + HiddenAttributesDefinition).ToDictionary();
                 }
                 catch (Exception e)
                 {
@@ -128,7 +130,7 @@ internal string GetAttributeDefinition(string name)
         {
             var preffix = name + "=";
 
-            return (AttributesDefinition ?? "").Trim()
+            return (HiddenAttributesDefinition ?? "").Trim()
                                                .Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
                                                .Where(x => x.StartsWith(preffix))
                                                .Select(x => x.Substring(preffix.Length))
@@ -139,9 +141,10 @@ internal void SetAttributeDefinition(string name, string value, bool append = fa
         {
             var preffix = name + "=";
 
-            var allItems = (AttributesDefinition ?? "").Trim()
-                                                       .Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
-                                                       .ToList();
+            var allItems = (HiddenAttributesDefinition ?? "")
+                .Trim()
+                .Split(";".ToCharArray(), StringSplitOptions.RemoveEmptyEntries)
+                .ToList();
 
             var items = allItems;
 
@@ -161,7 +164,7 @@ internal void SetAttributeDefinition(string name, string value, bool append = fa
                 }
             }
 
-            AttributesDefinition = string.Join(";", items.ToArray());
+            HiddenAttributesDefinition = string.Join(";", items.ToArray());
         }
 
         /// <summary>