Merge branch 'dev' into release

Noggog · Oct 15, 2020 · 7fc2de3 · 7fc2de3
2 parents f333695 + 1d32a4b
commit 7fc2de3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
-	<Version>0.18.3</Version>
+	<Version>0.18.4</Version>
   </PropertyGroup>
 </Project>
diff --git a/Mutagen.Bethesda.Core/Load Order/LoadOrder.cs b/Mutagen.Bethesda.Core/Load Order/LoadOrder.cs
@@ -21,7 +21,7 @@ namespace Mutagen.Bethesda
     /// </summary>
     public static class LoadOrder
     {
-        public static string GetPluginsPath(GameRelease game)
+        private static string GetRelativePluginsPath(GameRelease game)
         {
             return game switch
             {
@@ -32,6 +32,14 @@ public static string GetPluginsPath(GameRelease game)
             };
         }
 
+        public static string GetPluginsPath(GameRelease game)
+        {
+            string pluginPath = GetPluginsPath(game);
+            return Path.Combine(
+                Environment.GetEnvironmentVariable("LocalAppData"),
+                pluginPath);
+        }
+
         /// <summary>
         /// Attempts to locate the path to a game's load order file
         /// </summary>
@@ -40,11 +48,7 @@ public static string GetPluginsPath(GameRelease game)
         /// <returns>True if file located</returns>
         public static bool TryGetPluginsFile(GameRelease game, out FilePath path)
         {
-            string pluginPath = GetPluginsPath(game);
-            path = new FilePath(
-                Path.Combine(
-                    Environment.GetEnvironmentVariable("LocalAppData"),
-                    pluginPath));
+            path = new FilePath(GetPluginsPath(game));
             return path.Exists;
         }