Merge branch 'main' into dev

Mutagen-Modding · Nov 21, 2024 · 62b6c52 · 62b6c52
2 parents 5a9bac0 + f01cca1
commit 62b6c52
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 26 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -3,7 +3,7 @@ name: Release
 on:
   push:
     branches:
-      - release
+      - main
       - prerelease
       - dev
   pull_request:

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -27,7 +27,7 @@ jobs:
       run: dotnet publish "Synthesis.Bethesda.GUI/Synthesis.Bethesda.GUI.csproj" --configuration Release -p:PublishSingleFile=true -p:EnableCompressionInSingleFile=true
     - name: Archive Release
       run: |
-        powershell Compress-Archive Synthesis.Bethesda.GUI/bin/Release/net8.0/win-x64/publish/* Synthesis.zip
+        powershell Compress-Archive Synthesis.Bethesda.GUI/bin/Release/net9.0/win-x64/publish/* Synthesis.zip
     - name: Publish Synthesis GUI to Github
       uses: svenstaro/upload-release-action@v2
       with:

diff --git a/Synthesis.Bethesda.CLI/RunPipeline/RunPipelineLogic.cs b/Synthesis.Bethesda.CLI/RunPipeline/RunPipelineLogic.cs
@@ -18,27 +18,19 @@ public RunPipelineLogic(
 
     public static async Task<int> Run(RunPatcherPipelineCommand cmd, IFileSystem? fileSystem = null)
     {
-        try
-        {
-            var builder = new ContainerBuilder();
-            builder.RegisterModule(
-                new RunPipelineModule(fileSystem.GetOrDefault(), cmd));
+        var builder = new ContainerBuilder();
+        builder.RegisterModule(
+            new RunPipelineModule(fileSystem.GetOrDefault(), cmd));
 
-            var container = builder.Build();
+        var container = builder.Build();
 
-            container
-                .Resolve<IStartupTask[]>()
-                .ForEach(x => x.Start());
+        container
+            .Resolve<IStartupTask[]>()
+            .ForEach(x => x.Start());
 
-            await container
-                .Resolve<RunPipelineLogic>()
-                .RunInternal().ConfigureAwait(false);
-        }
-        catch (Exception ex)
-        {
-            System.Console.Error.WriteLine(ex);
-            return -1;
-        }
+        await container
+            .Resolve<RunPipelineLogic>()
+            .RunInternal().ConfigureAwait(false);
         return 0;
     }
 

diff --git a/Synthesis.Bethesda.UnitTests/CLI/RunPipelineLogicTests.cs b/Synthesis.Bethesda.UnitTests/CLI/RunPipelineLogicTests.cs
@@ -17,7 +17,7 @@ namespace Synthesis.Bethesda.UnitTests.CLI;
 
 public class RunPipelineLogicTests
 {
-    [Theory, MutagenModAutoData(FileSystem: TargetFileSystem.Real)]
+    [Theory(Skip = "Need to upgrade to target known published packages"), MutagenModAutoData(FileSystem: TargetFileSystem.Real)]
     public async Task Typical(
         IFileSystem fileSystem,
         string profileName,
@@ -26,11 +26,11 @@ public async Task Typical(
         SkyrimMod someMod,
         Npc npc)
     {
-        using var dataFolder = TempFolder.Factory();
-        using var patcherDir = TempFolder.Factory();
-        using var outputDir = TempFolder.Factory();
-        using var pluginList = new TempFile();
-        using var pipelineSettingsFile = new TempFile();
+        using var dataFolder = TempFolder.Factory(fileSystem: fileSystem);
+        using var patcherDir = TempFolder.Factory(fileSystem: fileSystem);
+        using var outputDir = TempFolder.Factory(fileSystem: fileSystem);
+        using var pluginList = new TempFile(fileSystem: fileSystem);
+        using var pipelineSettingsFile = new TempFile(fileSystem: fileSystem);
         var name = "TestName";
         var result = await new CreateTemplatePatcherSolutionRunner(fileSystem).Run(new CreateTemplatePatcherCommand()
         {
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,7 +3,7 @@ name: Release @@
     on:
       push:
         branches:
-          - release
+          - main
           - prerelease
           - dev
       pull_request:
@@ Expand Down @@