From 5b76a688b5c7367e8df933471739144eca6abec4 Mon Sep 17 00:00:00 2001 From: Frans Bouma Date: Wed, 6 Mar 2019 23:22:46 +0100 Subject: [PATCH] Fixed issue with empty headers --- src/DocNet/Config.cs | 21 ++++++++++++++++----- src/DocNet/Properties/AssemblyInfo.cs | 4 ++-- 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/src/DocNet/Config.cs b/src/DocNet/Config.cs index 256a48a..ae91100 100644 --- a/src/DocNet/Config.cs +++ b/src/DocNet/Config.cs @@ -275,13 +275,24 @@ namespace Docnet { if(string.IsNullOrWhiteSpace(_themeFolder)) { - var exeRawFolderUri = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase); - if(exeRawFolderUri == null) + string rawThemeFolder = _configData.ThemeFolder; + if(string.IsNullOrWhiteSpace(rawThemeFolder)) { - return string.Empty; // will end up as an error as themes now aren't found. + // not specified, assume local theme folder. + var exeRawFolderUri = System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().CodeBase); + if(exeRawFolderUri == null) + { + return string.Empty; // will end up as an error as themes now aren't found. + } + + var exeFolder = new Uri(exeRawFolderUri).LocalPath; + rawThemeFolder = Path.Combine(exeFolder, "Themes"); } - var exeFolder = new Uri(exeRawFolderUri).LocalPath; - _themeFolder = Path.Combine(Path.Combine(exeFolder, "Themes"), this.ThemeName); + else + { + rawThemeFolder = Utils.MakeAbsolutePath(_configFileSourcePath, (string)_configData.ThemeFolder) ?? "."; + } + _themeFolder = Path.Combine(rawThemeFolder, this.ThemeName); } return _themeFolder; } diff --git a/src/DocNet/Properties/AssemblyInfo.cs b/src/DocNet/Properties/AssemblyInfo.cs index 73fade9..e2c31f3 100644 --- a/src/DocNet/Properties/AssemblyInfo.cs +++ b/src/DocNet/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("0.16.3.0")] -[assembly: AssemblyFileVersion("0.16.3")] +[assembly: AssemblyVersion("0.16.4.0")] +[assembly: AssemblyFileVersion("0.16.4")]