Release v1.4.10.0

- Issue #182: RegistrySearch has "Win64=no" when building x64 installers - Issue #184: Certificate - SetComponentPermanent(true) does not make component permanent - Issue #185: INSTALLDIR with russian symbols - Issue #191: Setup crash in feature selection dialog - Issue #193: Localization - Issue #196: ID Generation is weak - Issue #197: How can I get wixpdb?
oleg-shilo · Nov 13, 2017 · d5d5266 · d5d5266
1 parent 5cf8e70
commit d5d5266
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 2 deletions.
diff --git a/Source/src/WixSharp.Samples/WixSharp.Lab.dll b/Source/src/WixSharp.Samples/WixSharp.Lab.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.Msi.dll b/Source/src/WixSharp.Samples/WixSharp.Msi.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.UI.dll b/Source/src/WixSharp.Samples/WixSharp.UI.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.dll b/Source/src/WixSharp.Samples/WixSharp.dll
diff --git a/Source/src/WixSharp.Samples/WixSharp.xml b/Source/src/WixSharp.Samples/WixSharp.xml
@@ -10434,6 +10434,13 @@
             <param name="file">The file.</param>
             <returns></returns>
         </member>
+        <member name="M:WixSharp.Project.HashedIdAlgorithm(WixSharp.WixEntity)">
+            <summary>
+            For future use
+            </summary>
+            <param name="entity">The entity.</param>
+            <returns></returns>
+        </member>
         <member name="M:WixSharp.Project.FindDir(System.String)">
             <summary>
             Finds <see cref="T:WixSharp.Dir"/> corresponding to the specified path.
@@ -12830,6 +12837,18 @@
             </summary>
             <value>The id.</value>
         </member>
+        <member name="M:WixSharp.WixEntity.IncrementalIdFor(WixSharp.WixEntity)">
+            <summary>
+            Index based ID generation algorithm.
+            <para>It is the default algorithm, which generates the most human readable IDs. Thus if the p
+            project has two `index.html` files one will be assigned ID `index.html` and another one
+            `index.html.1`.</para>
+            <para> Limitations: If two files have the same name it is non-deterministic which one gets
+            clear ID and which one the indexed one.</para>
+            </summary>
+            <param name="entity">The entity.</param>
+            <returns></returns>
+        </member>
         <member name="F:WixSharp.WixEntity.id">
             <summary>
             Backing value of <see cref="P:WixSharp.WixEntity.Id"/>.

diff --git a/Source/src/WixSharp/Project.cs b/Source/src/WixSharp/Project.cs
@@ -728,6 +728,26 @@ public string GetTargetPathOf(File file)
             return path.Join("\\");
         }
 
+        /// <summary>
+        /// For future use
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <returns></returns>
+        private string HashedIdAlgorithm(WixEntity entity)
+        {
+            if (entity is File file)
+            {
+                var target_path = this.GetTargetPathOf(file);
+                var hash = target_path.GetHashCode32();
+
+                // WiX does not allow '-' char in ID. So need to use `Math.Abs`
+                return $"{target_path.PathGetFileName()}_{Math.Abs(hash)}";
+            }
+            return null; // next two lines produce the same result
+                         // return WixEntity.DefaultIdAlgorithm(entity);
+                         // return WixEntity.IncrementalIdFor(entity);
+        }
+
         /// <summary>
         /// Finds <see cref="T:WixSharp.Dir"/> corresponding to the specified path.
         /// </summary>

diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.version.cs b/Source/src/WixSharp/Properties/AssemblyInfo.version.cs
@@ -7,5 +7,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.9.0")]
-[assembly: AssemblyFileVersion("1.4.9.0")]
+[assembly: AssemblyVersion("1.4.10.0")]
+[assembly: AssemblyFileVersion("1.4.10.0")]
diff --git a/Source/src/WixSharp/WixEntity.cs b/Source/src/WixSharp/WixEntity.cs
@@ -333,6 +333,16 @@ public string Id
             }
         }
 
+        /// <summary>
+        /// Index based ID generation algorithm.
+        /// <para>It is the default algorithm, which generates the most human readable IDs. Thus if the p
+        /// project has two `index.html` files one will be assigned ID `index.html` and another one
+        /// `index.html.1`.</para>
+        /// <para> Limitations: If two files have the same name it is non-deterministic which one gets
+        /// clear ID and which one the indexed one.</para>
+        /// </summary>
+        /// <param name="entity">The entity.</param>
+        /// <returns></returns>
         public static string IncrementalIdFor(WixEntity entity)
         {
             if (!idMaps.ContainsKey(entity.GetType()))