Release v1.4.4.0

* Issue #56: Install Dir Problem * Issue #58: Signtool could not be found on Win10 * Improved Compiler.BuildPackageAsmCmd(...) * Added InstallDir_DynamicPath sample * Issue #56: Escaping "minus" `-` character in folder names
oleg-shilo · May 2, 2017 · a4660a6 · a4660a6
1 parent 186be96
commit a4660a6
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 19 deletions.
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/InstallDir_AbsolutePath/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/InstallDir_AbsolutePath/setup.cs
@@ -10,24 +10,13 @@ class Script
     static public void Main()
     {
         var project = new ManagedProject("MyProduct",
-                          new Dir(new Id("ACTUAL_INSTALLDIR"), @"%ProgramFiles%\My Company\My Product", new File("setup.cs")),
-                          new Dir(new Id("ACTUAL_TARGETDIR1"), @"%DesktopFolder%\My Company\My Product2", new Files(@"files\*.*"))
-                          //new Dir(@"C:\MyCompany2", new File("setup.cs")),
-                          //new Dir(@"C:\MyCompany\MyProduct",
-                          //    new Files(@"files\*.*"))
-                          );
+                          new Dir(@"C:\MyCompany2", new File("setup.cs")),
+                          new Dir(@"C:\MyCompany\MyProduct",
+                              new Files(@"files\*.*")));
 
         project.UI = WUI.WixUI_ProgressOnly;
 
-        project.Load += Project_Load;
-
         Compiler.PreserveTempFiles = true;
         Compiler.BuildMsi(project);
     }
-
-    static void Project_Load(SetupEventArgs e)
-    {
-        e.Session["ACTUAL_INSTALLDIR"] = @"C:\My_Company2";
-        e.Session["ACTUAL_TARGETDIR1"] = @"C:\My_Company\MyProduct";
-    }
 }
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/InstallDir_DynamicPath/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/InstallDir_DynamicPath/setup.cs
@@ -9,9 +9,10 @@ class Script
 {
     static public void Main()
     {
-        var project = new ManagedProject("MyProduct",
-                                         new Dir(new Id("DIR1"), "root1", new File("setup.cs")),
-                                         new Dir(new Id("DIR2"), "root2", new Files(@"files\*.*")));
+        var project =
+            new ManagedProject("MyProduct",
+                new Dir(new Id("DIR1"), "root1", new File("setup.cs")),
+                new Dir(new Id("DIR2"), "root2", new Files(@"files\*.*")));
 
         project.UI = WUI.WixUI_ProgressOnly;
         project.Load += Project_Load;

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
@@ -4081,6 +4081,13 @@
             <param name="defaultValue">The default value.</param>
             <returns></returns>
         </member>
+        <member name="M:WixSharp.Extensions.ToId(System.String)">
+            <summary>
+            Converts string to <see cref="T:WixSharp.Id"/>.
+            </summary>
+            <param name="obj">Id string value.</param>
+            <returns></returns>
+        </member>
         <member name="M:WixSharp.Extensions.ToPublicString(System.Exception)">
             <summary>
             Returns Exception.ToString result containing no debug information.

diff --git a/Source/src/WixSharp/Properties/AssemblyInfo.cs b/Source/src/WixSharp/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.4.3.1")]
-[assembly: AssemblyFileVersion("1.4.3.1")]
+[assembly: AssemblyVersion("1.4.4.0")]
+[assembly: AssemblyFileVersion("1.4.4.0")]