Reverted inclusion of implicit mods

Mucked up logic when run straight from VS or with an explicitly specified plugins.txt
Mutagen-Modding · Nov 23, 2020 · b18e282 · b18e282
1 parent 0327eba
commit b18e282
Show file tree

Hide file tree

Showing 7 changed files with 56 additions and 7 deletions.
diff --git a/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj b/Mutagen.Bethesda.Synthesis/Mutagen.Bethesda.Synthesis.csproj
@@ -29,8 +29,8 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.21.5" />
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.21.5" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.21.6" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.21.6" />
     <PackageReference Include="NuGetizer" Version="0.4.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Mutagen.Bethesda.Synthesis/SynthesisPipeline.cs b/Mutagen.Bethesda.Synthesis/SynthesisPipeline.cs
@@ -296,7 +296,11 @@ public IEnumerable<LoadOrderListing> GetLoadOrder(
         {
             // This call will impliticly get Creation Club entries, too, as the Synthesis systems should be merging
             // things into a singular load order file for consumption here
-            var loadOrderListing = PluginListings.ListingsFromPath(loadOrderFilePath, release, dataFolderPath);
+            var loadOrderListing =
+                ImplicitListings.GetListings(release, dataFolderPath)
+                    .Select(x => new LoadOrderListing(x, enabled: true))
+                .Concat(PluginListings.RawListingsFromPath(loadOrderFilePath, release))
+                .Distinct(x => x.ModKey);
             if (userPrefs?.InclusionMods != null)
             {
                 var inclusions = userPrefs.InclusionMods.ToHashSet();

diff --git a/Synthesis.Bethesda.Execution/Runner.cs b/Synthesis.Bethesda.Execution/Runner.cs
@@ -86,7 +86,7 @@ public static async Task<bool> Run<TKey>(
                             loadOrderPath,
                             release,
                             loadOrderList,
-                            removeImplicitMods: false);
+                            removeImplicitMods: true);
                     }
                     catch (Exception ex)
                     {

diff --git a/Synthesis.Bethesda.Execution/Synthesis.Bethesda.Execution.csproj b/Synthesis.Bethesda.Execution/Synthesis.Bethesda.Execution.csproj
@@ -36,7 +36,7 @@
     <PackageReference Include="Microsoft.CodeAnalysis" Version="3.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="3.8.0" />
     <PackageReference Include="Microsoft.CodeAnalysis.Workspaces.MSBuild" Version="3.8.0" />
-    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.21.5" />
+    <PackageReference Include="Mutagen.Bethesda.Core" Version="0.21.6" />
     <PackageReference Include="NuGetizer" Version="0.4.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Synthesis.Bethesda.UnitTests/PipelineTests.cs b/Synthesis.Bethesda.UnitTests/PipelineTests.cs
@@ -0,0 +1,45 @@
+using FluentAssertions;
+using Mutagen.Bethesda;
+using Mutagen.Bethesda.Synthesis;
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Text;
+using Xunit;
+
+namespace Synthesis.Bethesda.UnitTests
+{
+    public class PipelineTests
+    {
+        [Fact]
+        public void AddsImplicitMods()
+        {
+            using var tmp = Utility.GetTempFolder();
+
+            var pluginPath = Path.Combine(tmp.Dir.Path, "Plugins.txt");
+            var dataFolder = Path.Combine(tmp.Dir.Path, "Data");
+            Directory.CreateDirectory(dataFolder);
+            File.WriteAllText(
+                Path.Combine(dataFolder, Mutagen.Bethesda.Skyrim.Constants.Skyrim.FileName),
+                string.Empty);
+            File.WriteAllLines(pluginPath,
+                new string[]
+                {
+                    $"*{Utility.TestModKey.FileName}",
+                    $"{Utility.OverrideModKey.FileName}",
+                });
+            var listings = SynthesisPipeline.Instance.GetLoadOrder(
+                GameRelease.SkyrimSE,
+                loadOrderFilePath: pluginPath,
+                dataFolderPath: dataFolder).ToList();
+            listings.Should().HaveCount(3);
+            listings.Should().BeEquivalentTo(new LoadOrderListing[]
+            {
+                new LoadOrderListing(Mutagen.Bethesda.Skyrim.Constants.Skyrim, true),
+                new LoadOrderListing(Utility.TestModKey, true),
+                new LoadOrderListing(Utility.OverrideModKey, false),
+            });
+        }
+    }
+}
diff --git a/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj b/Synthesis.Bethesda.UnitTests/Synthesis.Bethesda.UnitTests.csproj
@@ -18,7 +18,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda" Version="0.21.5" />
+    <PackageReference Include="Mutagen.Bethesda" Version="0.21.6" />
     <PackageReference Include="NuGetizer" Version="0.4.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/Synthesis.Bethesda/Synthesis.Bethesda.csproj b/Synthesis.Bethesda/Synthesis.Bethesda.csproj
@@ -30,7 +30,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.21.5" />
+    <PackageReference Include="Mutagen.Bethesda.Kernel" Version="0.21.6" />
     <PackageReference Include="NuGetizer" Version="0.4.11">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>