- - WiX4: wip

oleg-shilo · Apr 8, 2023 · 9fa5281 · 9fa5281
1 parent c9d214e
commit 9fa5281
Show file tree

Hide file tree

Showing 20 changed files with 174 additions and 61 deletions.
diff --git a/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs b/Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs
@@ -43,6 +43,8 @@ static public void Main()
 
         project.GUID = new Guid("6f330b47-2577-43ad-9095-1861ba25889b");
 
+        project.UI = WUI.WixUI_InstallDir;
+
         project.EmitConsistentPackageId = true;
         project.PreserveTempFiles = true;
         project.PreserveDbgFiles = true;

diff --git a/Source/src/WixSharp/Action.cs b/Source/src/WixSharp/Action.cs
@@ -27,6 +27,8 @@ THE SOFTWARE.
 
 #endregion Licence...
 
+using System.Xml.Linq;
+
 namespace WixSharp
 {
     /// <summary>
@@ -174,6 +176,12 @@ public Action(Id id, Return returnType, When when, Step step, Condition conditio
         /// </summary>
         public Condition Condition = Condition.NOT_Installed;
 
+#if WIX3
+        internal object ToXmlCondition() => this.Condition.ToXValue();
+#else
+        internal XAttribute ToXmlCondition() => new XAttribute("Condition", this.Condition.ToString());
+#endif
+
         /// <summary>
         /// The sequence number for this action. Mutually exclusive with Before, After, and OnExit of <see cref="When"/> field.
         /// </summary>

diff --git a/Source/src/WixSharp/Bootstrapper/BootstrapperApplication.cs b/Source/src/WixSharp/Bootstrapper/BootstrapperApplication.cs
@@ -3,7 +3,11 @@
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
+#if WIX3
 using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 
 using sys = System.IO;
 

diff --git a/Source/src/WixSharp/CommonTasks.cs b/Source/src/WixSharp/CommonTasks.cs
@@ -32,10 +32,14 @@ THE SOFTWARE.
 using System.Windows.Forms;
 using System.Xml.Linq;
 using System.Xml.XPath;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp;
 using WixSharp.Bootstrapper;
 using WixSharp.Controls;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 using IO = System.IO;
 
 namespace WixSharp.CommonTasks

diff --git a/Source/src/WixSharp/Compiler.Bootstrapper.cs b/Source/src/WixSharp/Compiler.Bootstrapper.cs
@@ -37,8 +37,12 @@ THE SOFTWARE.
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml.Linq;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.Bootstrapper;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 using IO = System.IO;
 
 namespace WixSharp

diff --git a/Source/src/WixSharp/Compiler.cs b/Source/src/WixSharp/Compiler.cs
diff --git a/Source/src/WixSharp/Extensions.cs b/Source/src/WixSharp/Extensions.cs
@@ -17,11 +17,15 @@
 using System.Text.RegularExpressions;
 using System.Windows.Forms;
 using System.Xml.Linq;
-using Microsoft.Deployment.WindowsInstaller;
 using Microsoft.Tools.WindowsInstallerXml.Bootstrapper;
 using Microsoft.Win32;
 using WixSharp.CommonTasks;
 using static WixSharp.SetupEventArgs;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 
 using IO = System.IO;
 
@@ -2806,7 +2810,7 @@ public static bool IsCancelled(this Session session)
         {
             try
             {
-                session.Message(Microsoft.Deployment.WindowsInstaller.InstallMessage.ActionData, new Record());
+                session.Message(WixToolset.Dtf.WindowsInstaller.InstallMessage.ActionData, new Record());
             }
             catch (InstallCanceledException)
             {

diff --git a/Source/src/WixSharp/InternetShortcut.cs b/Source/src/WixSharp/InternetShortcut.cs
@@ -7,13 +7,17 @@
 using System.Security.Principal;
 using System.Text;
 using System.Xml.Linq;
-using Microsoft.Deployment.WindowsInstaller;
 using Microsoft.Win32;
 using System.Globalization;
 using System.Reflection;
 using System.Text.RegularExpressions;
 using static WixSharp.SetupEventArgs;
 using WixSharp.CommonTasks;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 
 namespace WixSharp
 {

diff --git a/Source/src/WixSharp/ManagedAction.cs b/Source/src/WixSharp/ManagedAction.cs
@@ -28,7 +28,11 @@ THE SOFTWARE.
 using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+#if WIX3
 using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 
 namespace WixSharp
 {

diff --git a/Source/src/WixSharp/ManagedProject/Interfaces.cs b/Source/src/WixSharp/ManagedProject/Interfaces.cs
@@ -1,7 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+#if WIX3
 using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 using Reflection = System.Reflection;
 
 #pragma warning disable 1591

diff --git a/Source/src/WixSharp/ManagedProject/ManagedProject.cs b/Source/src/WixSharp/ManagedProject/ManagedProject.cs
@@ -6,9 +6,14 @@
 using System.Linq.Expressions;
 using System.Reflection;
 using System.Text;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.CommonTasks;
 
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
+
 using IO = System.IO;
 
 namespace WixSharp

diff --git a/Source/src/WixSharp/ManagedProject/ManagedProjectActions.cs b/Source/src/WixSharp/ManagedProject/ManagedProjectActions.cs
@@ -4,8 +4,12 @@
 using System.Linq.Expressions;
 using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.CommonTasks;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 
 namespace WixSharp
 {

diff --git a/Source/src/WixSharp/ManagedProject/SetupEventArgs.cs b/Source/src/WixSharp/ManagedProject/SetupEventArgs.cs
@@ -2,9 +2,14 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Security.Principal;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.CommonTasks;
 
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
+
 namespace WixSharp
 {
     /// <summary>

diff --git a/Source/src/WixSharp/NativeImage.cs b/Source/src/WixSharp/NativeImage.cs
@@ -7,11 +7,15 @@
 using System.Security.Principal;
 using System.Text;
 using System.Xml.Linq;
-using Microsoft.Deployment.WindowsInstaller;
 using Microsoft.Win32;
 using System.Globalization;
 using System.Reflection;
 using System.Text.RegularExpressions;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 using static WixSharp.SetupEventArgs;
 
 namespace WixSharp

diff --git a/Source/src/WixSharp/ProjectValidator.cs b/Source/src/WixSharp/ProjectValidator.cs
@@ -36,9 +36,12 @@ THE SOFTWARE.
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.CommonTasks;
-
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 using IO = System.IO;
 using Reflection = System.Reflection;
 

diff --git a/Source/src/WixSharp/ResilientPackage.cs b/Source/src/WixSharp/ResilientPackage.cs
@@ -2,9 +2,15 @@
 using System.ComponentModel;
 using System.Runtime.InteropServices;
 using System.Text;
-using Microsoft.Deployment.WindowsInstaller;
 using WixSharp.CommonTasks;
 using WixSharp.Utilities;
+
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
+
 using IO = System.IO;
 
 namespace WixSharp
@@ -65,7 +71,7 @@ public static void EnableResilientPackage(this Project project, string resilient
                     Return.check,
                     When.Before, Step.PublishProduct,
                     Condition.NOT_Installed)
-            );
+                              );
 
             var assembly = typeof(ResilientPackage).Assembly.Location;
 
@@ -93,7 +99,7 @@ public static void EnableResilientPackage(this Project project, string resilient
                 {
                     UsesProperties = $"UserSID,OriginalDatabase,ALLUSERS,{WIXSHARP_RESILIENT_SOURCE_DIR}"
                 }
-            );
+                              );
         }
 
         /// <summary>

diff --git a/Source/src/WixSharp/UACRevealer.cs b/Source/src/WixSharp/UACRevealer.cs
@@ -11,10 +11,14 @@
 using System.Windows.Forms;
 using System.Xml.Linq;
 using System.Xml.XPath;
-using Microsoft.Deployment.WindowsInstaller;
 using Microsoft.Win32;
 using WixSharp;
 using WixSharp.Controls;
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
 
 namespace WixSharp.CommonTasks
 {

diff --git a/Source/src/WixSharp/UninstallFullUI.cs b/Source/src/WixSharp/UninstallFullUI.cs
@@ -1,8 +1,13 @@
 using System.Linq;
-using Microsoft.Deployment.WindowsInstaller;
 using Microsoft.Win32;
 using WixSharp.CommonTasks;
 
+#if WIX3
+using Microsoft.Deployment.WindowsInstaller;
+#else
+using WixToolset.Dtf.WindowsInstaller;
+#endif
+
 namespace WixSharp
 {
     /// <summary>
@@ -79,7 +84,7 @@ public static void EnableUninstallFullUI(this Project project, string displayIco
                 {
                     return;
                 }
-                
+
                 var comp = doc.FindAll("RegistryValue")
                     .First(x => x.HasAttribute("Id", "WixSharp_RegValue_DisplayIcon"))
                     .Parent

diff --git a/Source/src/WixSharp/WixExtension.cs b/Source/src/WixSharp/WixExtension.cs
@@ -199,7 +199,11 @@ public static string GetNamespaceDeclaration(string prefix, string @namespace)
         /// <summary>
         /// Well-known Wix Extension UI
         /// </summary>
+#if WIX3
         public static WixExtension UI = new WixExtension("%WixLocation%\\WixUIExtension.dll", null, null);
+#else
+        public static WixExtension UI = new WixExtension(@"C:\Users\oleg.shilo\.nuget\packages\wixtoolset.ui.wixext\4.0.0\wixext4\WixToolset.UI.wixext.dll", null, null);
+#endif
     }
 
     /// <summary>

diff --git a/Source/src/WixSharp/WixSharp.csproj b/Source/src/WixSharp/WixSharp.csproj
@@ -281,6 +281,11 @@
       <Name>WixSharp.Msi</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Dtf.WindowsInstaller">
+      <Version>4.0.0</Version>
+    </PackageReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.