From 95553de674d2652b4102399d5eebba58c89fcb55 Mon Sep 17 00:00:00 2001 From: oleg-shilo Date: Fri, 9 Dec 2016 13:23:37 +1100 Subject: [PATCH] Issue#2: Cannot add environment variables to project object if only merge modules are present. --- Source/src/WixSharp/Compiler.cs | 2 +- Source/src/WixSharp/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Source/src/WixSharp/Compiler.cs b/Source/src/WixSharp/Compiler.cs index 75992180..ecd1919a 100644 --- 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 index f4d6c9f4..3d4d715f 100644 --- 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")]