Issue#2: Cannot add environment variables to project object if only m…

…erge modules are present.
oleg-shilo · Dec 9, 2016 · 95553de · 95553de
1 parent 9b6f4fa
commit 95553de
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/Source/src/WixSharp/Compiler.cs b/Source/src/WixSharp/Compiler.cs
@@ -1282,7 +1282,7 @@ static XElement GetTopLevelDir(XElement product)
             {
                 prevDir = dir;
                 if (dir.Elements("Component").Count() == 0) //just a subdirectory without any installable items
-                    dir = dir.Elements("Directory").First();
+                    dir = dir.Elements("Directory").FirstOrDefault();
                 else
                     return dir; //dir containing installable items (e.g. files or shortcuts)
             }

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