Issue #372: MsiFile location

oleg-shilo · May 25, 2018 · 49ead4e · 49ead4e
1 parent f5d04f9
commit 49ead4e
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 3 deletions.
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/AllInOne/MyAppWix.cs b/Source/src/WixSharp.Samples/Wix# Samples/AllInOne/MyAppWix.cs
@@ -61,6 +61,7 @@ static public void Main(string[] args)
             project.UI = WUI.WixUI_Mondo;
             project.SourceBaseDir = Environment.CurrentDirectory;
             project.OutFileName = "MyApp";
+
             project.InstallPrivileges = InstallPrivileges.elevated;
 
             // project.PreserveTempFiles = true;

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Install on x64/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Install on x64/setup.cs
@@ -28,8 +28,10 @@ static public void Build()
                 new RegValue(RegistryHive.LocalMachine, @"Software\My Company\My Product", "Message", "Hello"));
 
         project.PreserveTempFiles = true;
-        if (Environment.GetEnvironmentVariable("buid_as_64") != null)
-            project.Platform = Platform.x64;
+
+        // uncomment this line if you want to make the build of the x64 vs x86 controlled by the external condition.
+        // if (Environment.GetEnvironmentVariable("buid_as_64") != null) 
+        project.Platform = Platform.x64;
 
         project.GUID = new Guid("6f330b47-2577-43ad-9095-1861ba25889b");
 

diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/CustomUISequence/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Managed Setup/CustomUISequence/setup.cs
@@ -68,6 +68,7 @@ static public void Main()
 
         project.ManagedUI.Icon = "app.ico";
         project.UILoaded += Project_UILoaded;
+
         project.MinimalCustomDrawing = true;
 
         project.GUID = new Guid("6f330b47-2577-43ad-9095-1861ba25889b");

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
@@ -1088,6 +1088,31 @@
             <param name="msiPath">The path.</param>
             <returns></returns>
         </member>
+        <member name="M:WixSharp.CommonTasks.Tasks.GetMainWindow(System.String,System.Func{System.Diagnostics.Process,System.Boolean})">
+            <summary>
+            Gets the main window of the process, which satisfies the 'filter' condition.
+            </summary>
+            <param name="processName">Name of the process.</param>
+            <param name="filter">The filter.</param>
+            <returns></returns>
+        </member>
+        <member name="T:WixSharp.CommonTasks.Tasks.NativeWindow">
+            <summary>
+            Simple implementation of <see cref="T:System.Windows.Forms.IWin32Window" />.
+            </summary>
+            <seealso cref="T:System.Windows.Forms.IWin32Window" />
+        </member>
+        <member name="M:WixSharp.CommonTasks.Tasks.NativeWindow.#ctor(System.Nullable{System.IntPtr})">
+            <summary>
+            Initializes a new instance of the <see cref="T:WixSharp.CommonTasks.Tasks.NativeWindow"/> class.
+            </summary>
+            <param name="hwnd">The HWND.</param>
+        </member>
+        <member name="P:WixSharp.CommonTasks.Tasks.NativeWindow.Handle">
+            <summary>
+            Gets the handle to the window represented by the implementer.
+            </summary>
+        </member>
         <member name="T:WixSharp.CommonTasks.ExternalTool">
             <summary>
             A generic utility class for running console application tools (e.g. compilers, utilities)
@@ -1102,6 +1127,23 @@
             The encoding.
             </value>
         </member>
+        <member name="F:WixSharp.CommonTasks.ExternalTool.ConsoleOut">
+            <summary>
+            The default console out handler. It can be used when you want to have fine control over 
+            STD output of the external tool.
+            </summary>
+            <example>The following is an example of masking the word 'secret' in the output text.
+            <code>
+            ExternalTool.ConsoleOut = (line) => Console.WriteLine(line.Replace("secret", "******"))
+            var tool = new ExternalTool
+            { 
+                ExePath = "tool.exe",
+                Arguments = "-a -b",
+            };
+            tool.ConsoleRun();
+            </code>
+            </example>
+        </member>
         <member name="F:WixSharp.CommonTasks.ExternalTool.DefaultEncoding">
             <summary>
             Gets or sets the default encoding to be used to process external executable output.
@@ -6962,6 +7004,16 @@
             <c>true</c> if installing; otherwise, <c>false</c>.
             </value>
         </member>
+        <member name="M:WixSharp.Extensions.GetMainWindow(Microsoft.Deployment.WindowsInstaller.Session)">
+            <summary>
+            <para>
+            Gets the main window of the <c>msiexec.exe</c> process that has 'MainWindowTitle' containing the name of the product being installed. 
+            </para>
+            This method is a convenient way to display message box from a custom action with properly specified parent window.
+            </summary>
+            <param name="session">The session.</param>
+            <returns></returns>
+        </member>
         <member name="M:WixSharp.Extensions.IsRepairing(Microsoft.Deployment.WindowsInstaller.Session)">
             <summary>
             Gets a value indicating whether the product is being repaired.

diff --git a/Source/src/WixSharp/ManagedProject/SetupEventArgs.cs b/Source/src/WixSharp/ManagedProject/SetupEventArgs.cs
@@ -177,7 +177,7 @@ public string ProductName
         /// <value>
         /// The msi file.
         /// </value>
-        public string MsiFile { get { return Data["MsiFile"]; } }
+        public string MsiFile { get { return Data["MsiFile"] ?? Session.Property("OriginalDatabase"); } } // Data may not be initializaed it 
 
         /// <summary>
         /// Gets the setup mode.