From d4f97eac40040f935088a6c170cfd47ab2f0b080 Mon Sep 17 00:00:00 2001 From: Shannon Date: Tue, 23 Jan 2018 10:53:27 -0700 Subject: [PATCH] Fixes how the file paths can be set dynamically on startup, bumps version --- .../CompositeFiles/Providers/XmlFileMapper.cs | 8 ++++---- SolutionInfo.cs | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ClientDependency.Core/CompositeFiles/Providers/XmlFileMapper.cs b/ClientDependency.Core/CompositeFiles/Providers/XmlFileMapper.cs index c6ad210..c7199b7 100644 --- a/ClientDependency.Core/CompositeFiles/Providers/XmlFileMapper.cs +++ b/ClientDependency.Core/CompositeFiles/Providers/XmlFileMapper.cs @@ -25,19 +25,19 @@ public class XmlFileMapper : BaseFileMapProvider { public const string DefaultName = "XmlFileMap"; - private const string MapFileName = "map.xml"; + private const string DefaultFileMapFolder = "~/App_Data/ClientDependency"; private XDocument _doc; private FileInfo _xmlFile; private static readonly object Locker = new object(); - private static string _fileMapFolder = "~/App_Data/ClientDependency"; + private static string _fileMapFolder = DefaultFileMapFolder; private static bool _dynamicallyConfiguredPath = false; [Obsolete("Use FileMapDefaultFolder instead")] [EditorBrowsable(EditorBrowsableState.Never)] - public static string FileMapVirtualFolder = _fileMapFolder; + public static string FileMapVirtualFolder = DefaultFileMapFolder; /// /// Specifies the default folder to store the file map in, either absolute or virtual @@ -62,7 +62,7 @@ public static string FileMapDefaultFolder public XmlFileMapper() { //here we need to do a backwards compat check - if (FileMapVirtualFolder != _fileMapFolder) + if (FileMapVirtualFolder != DefaultFileMapFolder) { //in this case, the legacy FileMapVirtualFolder was updated which means that we need to change //the non-legacy FileMapDefaultFolder value diff --git a/SolutionInfo.cs b/SolutionInfo.cs index 5c84a54..b5040e5 100644 --- a/SolutionInfo.cs +++ b/SolutionInfo.cs @@ -7,6 +7,6 @@ [assembly: AssemblyCulture("")] -[assembly: AssemblyVersion("1.9.5")] -[assembly: AssemblyFileVersion("1.9.5")] -[assembly: AssemblyInformationalVersion("1.9.5")] +[assembly: AssemblyVersion("1.9.6")] +[assembly: AssemblyFileVersion("1.9.6")] +[assembly: AssemblyInformationalVersion("1.9.6")]