Release v1.9.8

- Issue #645: Add ampersand character (&) as xml delimiter
- `WixSharp.Extensions` class that is implemented in both _WixSharp.dll_ and _WixSharp.Msi.dll_ is refactored to
`WixSharp.Msi.Extensions` ifor the _WixSharp.Msi.dll_ assembly. This is done in order to avoid ambiguety when using both assemblies at the same time.
  While it is a breaking change it is very easy to handle one and requires only an update in the _using_ clause:
  ```C#
  using WixSharp.Msi;
  // instead of old "using WixSharp;"
  ```

Source/NuGet/WixSharp/WixSharp.bin.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/10/nuspec.xsd">
   <metadata>
     <id>WixSharp.bin</id>
-    <version>1.9.7.0</version>
+    <version>1.9.8.0</version>
     <title>Wix# (WixSharp) - Binaries</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -16,7 +16,15 @@ The package contains Wix# binaries only.
 In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# (WixSharp) - Binaries</summary>
-    <releaseNotes></releaseNotes>
+    <releaseNotes>Release v1.9.8
+- Issue #645: Add ampersand character (&amp;) as xml delimiter
+- `WixSharp.Extensions` class that is implemented in both _WixSharp.dll_ and _WixSharp.Msi.dll_ is refactored to
+`WixSharp.Msi.Extensions` for the _WixSharp.Msi.dll_ assembly. This is done in order to avoid ambiguity when using both assemblies at the same time.
+  While it is a breaking change it is very easy to handle one and requires only an update in the _using_ clause:
+  ```C#
+  using WixSharp.Msi;
+  // instead of old "using WixSharp;"
+  ```</releaseNotes>
     <copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>

Source/NuGet/WixSharp/WixSharp.lab.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp.Lab</id>
-    <version>1.9.7.0</version>
+    <version>1.9.8.0</version>
     <title>Wix# (WixSharp) - Experimantal features</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -14,7 +14,15 @@
 The package contains the sample code for building a simple MSI with the CLR WinForm dialog inserted into UI sequence between InsallDirDlg and VerifyReadyDlg native MSI dialogs. In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# binaries containing experimental features (e.g. native WiX UI support).</summary>
-    <releaseNotes></releaseNotes>
+    <releaseNotes>Release v1.9.8
+- Issue #645: Add ampersand character (&amp;) as xml delimiter
+- `WixSharp.Extensions` class that is implemented in both _WixSharp.dll_ and _WixSharp.Msi.dll_ is refactored to
+`WixSharp.Msi.Extensions` for the _WixSharp.Msi.dll_ assembly. This is done in order to avoid ambiguity when using both assemblies at the same time.
+  While it is a breaking change it is very easy to handle one and requires only an update in the _using_ clause:
+  ```C#
+  using WixSharp.Msi;
+  // instead of old "using WixSharp;"
+  ```</releaseNotes>
     <copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# Scripting msi install setup</tags>
@@ -23,7 +31,7 @@ The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2
       <frameworkAssembly assemblyName="System.Drawing" targetFramework="" />
     </frameworkAssemblies>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.9.7.0" />
+      <dependency id="WixSharp.bin" version="1.9.8.0" />
     </dependencies>
   </metadata>
   <files>

Source/NuGet/WixSharp/WixSharp.nuspec

@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>WixSharp</id>
-    <version>1.9.7.0</version>
+    <version>1.9.8.0</version>
     <title>Wix# (WixSharp) - managed interface for WiX</title>
     <authors>Oleg Shilo</authors>
     <owners>Oleg Shilo</owners>
@@ -18,12 +18,20 @@ If you need only Wix# binaries you may want to use WixSharp.bin package instead.
 In order to use this package you need have WiX Toolset installed.
 The package is tested against WIX (Windows Installer Xml) Toolset v3.10 (v3.10.2103.0)</description>
     <summary>Wix# (WixSharp) - Binaries</summary>
-    <releaseNotes></releaseNotes>
+    <releaseNotes>Release v1.9.8
+- Issue #645: Add ampersand character (&amp;) as xml delimiter
+- `WixSharp.Extensions` class that is implemented in both _WixSharp.dll_ and _WixSharp.Msi.dll_ is refactored to
+`WixSharp.Msi.Extensions` for the _WixSharp.Msi.dll_ assembly. This is done in order to avoid ambiguity when using both assemblies at the same time.
+  While it is a breaking change it is very easy to handle one and requires only an update in the _using_ clause:
+  ```C#
+  using WixSharp.Msi;
+  // instead of old "using WixSharp;"
+  ```</releaseNotes>
     <copyright>Copyright (C) 2004-2018 Oleg Shilo</copyright>
     <language>en-AU</language>
     <tags>C# scripting msi install setup wix</tags>
     <dependencies>
-      <dependency id="WixSharp.bin" version="1.9.7.0" />
+      <dependency id="WixSharp.bin" version="1.9.8.0" />
     </dependencies>
   </metadata>
   <files>

Source/src/WixSharp.Samples/Wix# Samples/Install Files/setup.cs

@@ -53,7 +53,7 @@ static public void Main()
 
         project.WixSourceGenerated += Compiler_WixSourceGenerated;
 
-        project.BuildMsiCmd();
+        project.BuildMsi();
     }
 
     private static void Compiler_WixSourceGenerated(XDocument document)

Source/src/WixSharp.Samples/Wix# Samples/Install Font/setup.cs

@@ -11,7 +11,7 @@ static public void Main()
         var project =
             new Project("MyProduct",
                 new Dir(@"%ProgramFiles%\My Company\My Product",
-                    new File("readme.txt")),
+                    new File("readme.txt") { ComponentId = "asm" }),
                 new Dir("%Fonts%",
                     new FontFile("FreeSansBold.ttf")));
 
@@ -24,7 +24,4 @@ static public void Main()
 
         project.BuildMsi();
     }
-}
-
-
-
+}

Source/src/WixSharp.Samples/Wix# Samples/Shortcuts/setup.cs

@@ -50,7 +50,7 @@ static public void Main()
             // project.OutFileName = "setup";
             // project.PreserveTempFiles = true;
 
-            Compiler.BuildMsiCmd(project);
+            Compiler.BuildMsi(project);
         }
         catch (System.Exception ex)
         {

Source/src/WixSharp.Test/GenericTest.cs

@@ -208,7 +208,7 @@ public void Shoud_Expend_Media()
         [Fact]
         public void Shoud_Resolve_WixVars()
         {
-            Func<string, string> asWixVarToPath = name => WixSharpMsi.WixSharp.Extensions.AsWixVarToPath(name);
+            Func<string, string> asWixVarToPath = name => name.AsWixVarToPath();
 
             var adminToolsFolder = asWixVarToPath("AdminToolsFolder");
             var appDataFolder = asWixVarToPath("AppDataFolder");

Source/src/WixSharp.Test/XmlInjectionTests.cs

@@ -1,9 +1,9 @@
 using System;
 using System.Collections.Generic;
-using System.Xml.Linq;
 using System.IO;
-using File = WixSharp.File;
+using System.Xml.Linq;
 using Xunit;
+using File = WixSharp.File;
 
 namespace WixSharp.Test
 {
@@ -26,14 +26,14 @@ public void Test()
             var ex = Assert.Throws<ApplicationException>(() =>
             {
                 var project = new Project("SetupLettersDiagnostics",
-                                           new Dir(@"%ProgramFiles%\test",
-                                                   new File(featureA, Path.Combine("", "nunit.exe")),
-                                                   new File(featureA, Path.Combine("", "Lib", "nunit-console-runner.dll"),
-                                                            new Merge(featureB, "MyMergeModule.msm"))));
+                                          new Dir(@"%ProgramFiles%\test",
+                                                  new File(featureA, Path.Combine("", "nunit.exe")),
+                                                  new File(featureA, Path.Combine("", "Lib", "nunit-console-runner.dll"),
+                                                           new Merge(featureB, "MyMergeModule.msm"))));
             });
 
             Assert.True(ex.Message.StartsWith("WixSharp.Merge is unexpected."));
-         }
+        }
     }
 
     public class XmlInjectionTests

Source/src/WixSharp/Properties/AssemblyInfo.version.cs

@@ -7,5 +7,5 @@
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("1.9.7.0")]
-[assembly: AssemblyFileVersion("1.9.7.0")]
+[assembly: AssemblyVersion("1.9.8.0")]
+[assembly: AssemblyFileVersion("1.9.8.0")]

Source/src/WixSharp/SharedExtensions.cs

@@ -1,7 +1,12 @@
 using System;
 using System.IO;
 
+#if WIXSHARP_MSI
+
+namespace WixSharp.Msi
+#else
 namespace WixSharp
+#endif
 {
     /// <summary>
     /// Collection of generic WixSharp extension methods