Refactoring to new BuildEngine API;

Update to .NET 5;
Change to packing with UnPak;
Remove u4pak/UnrealPak support;
Remove script download support;
Remove old build runners and services;
Remove build context and factory;

.github/workflows/build.yml

@@ -26,7 +26,7 @@ jobs:
         fetch-depth: 0
     - uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '3.1.x'
+        dotnet-version: '5.0.x'
     - name: Run the Cake script
       uses: cake-build/cake-action@v1
       with:

global.json

@@ -1,3 +1,5 @@
 {
-	"sdk": { "version": "3.1.403" }
+	"sdk": { "version": "5.0.301",
+		"rollForward": "latestMinor"
+	}
 }

src/PackCreator/Build/BuildInstruction.cs

@@ -1,19 +1,9 @@
 using System.Collections.Generic;
 using System.IO;
 using AceCore;
+using BuildEngine.Builder;
 
 namespace PackCreator {
-    public abstract class BuildInstruction {
-        protected BuildInstruction()
-        {
-
-        }
-        public string TargetPath {get;set;}
-        // public string PackGroup {get;set;}
-        public SourceGroup SourceGroup {get;set;}
-        public List<FileInfo> SourceFiles {get;set;} = new List<FileInfo>();
-        public virtual string GetOutputName(string separator = "_") => null;
-    }
 
     public class BuildInstruction<T> : BuildInstruction where T : Identifier {
         public BuildInstruction(T identifier)

src/PackCreator/Build/BuildService.cs

@@ -3,26 +3,52 @@
 using System.Linq;
 using System.Threading.Tasks;
 using AceCore;
+using BuildEngine;
+using BuildEngine.Builder;
 using ExecEngine;
 using Microsoft.Extensions.Logging;
 using PackCreator.Build;
+using UnPak.Core;
 
 namespace PackCreator {
+
+    public class PackBuildService : BuildService<DirectoryBuildContext>
+    {
+        private readonly ILogger<PackBuildService> _logger;
+
+        private readonly PakFileProvider _pakFileProvider;
+        // private readonly IModBuilder _modBuilder;
+
+        public PackBuildService(DirectoryBuildContext context, ILogger<PackBuildService> logger, PakFileProvider pakFileProvider) : base(context) {
+            _logger = logger;
+            _pakFileProvider = pakFileProvider;
+            // _modBuilder = modBuilder;
+        }
+
+        public override  Task<(bool Success, FileSystemInfo Output)> RunBuildAsync(string targetFileName) {
+            var writer = _pakFileProvider.GetWriter();
+            var gameDir = new DirectoryInfo(Directory.GetDirectories(Context.WorkingDirectory.FullName).First());
+            var targetBuildPath = Path.IsPathRooted(targetFileName) ? targetFileName : Path.Combine(Context.WorkingDirectory.FullName, targetFileName);
+            var fi = writer.BuildFromDirectory(gameDir, new FileInfo(targetBuildPath));
+            return Task.FromResult((fi.Exists, (FileSystemInfo) fi));
+        }
+    }
+
     public class BuildService {
         private readonly ILogger<BuildService> _logger;
-        private readonly BuildContextFactory _contextFactory;
-        private readonly IBuildRunner _runner;
+        private readonly DirectoryBuildContextFactory _contextFactory;
+        // private readonly IBuildRunner _runner;
 
-        public BuildService(ILogger<BuildService> logger, BuildContextFactory contextFactory, IBuildRunner runner) {
+        public BuildService(ILogger<BuildService> logger, DirectoryBuildContextFactory contextFactory) {
             _logger = logger;
             _contextFactory = contextFactory;
-            _runner = runner;
+            // _runner = runner;
         }
 
 
         public async Task<FileInfo> RunBuild(string objName, string rootPath, params BuildInstruction[] contextTargets) {
             var targets = contextTargets.ToList();
-            using (var ctx = await _contextFactory.Create(objName))
+            using (var ctx = _contextFactory.CreateContext(objName))
             {
                 foreach (var target in targets)
                 {
@@ -33,7 +59,8 @@ public async Task<FileInfo> RunBuild(string objName, string rootPath, params Bui
                         return null;
                     }
                 }
-                var buildResult = _runner.RunBuild(ctx.BuildScript, "packed-files.pak");
+                // var buildResult = _runner.RunBuild(null, "packed-files.pak");
+                (bool Success, FileInfo Output) buildResult = (false, null);
                 // var buildResult = ctx.RunBuild(_runner, "packed-files.pak");
                 if (buildResult.Success) {
                     _logger.LogInformation($"[bold green]Success![/] Files for {objName.GetFriendlyName()} successfully packed from {targets.Sum(t => t.SourceFiles.Count)} files (in {targets.Count} targets)");

src/PackCreator/Build/BuildServiceProvider.cs

@@ -0,0 +1,24 @@
+using System.Threading.Tasks;
+using BuildEngine;
+using Microsoft.Extensions.Logging;
+using UnPak.Core;
+
+namespace PackCreator.Build
+{
+    public class BuildServiceProvider : IBuildServiceProvider
+    {
+        private readonly DirectoryBuildContextFactory _buildContextFactory;
+        private readonly ILogger<PackBuildService> _buildLogger;
+        private readonly PakFileProvider _pakFileProvider;
+
+
+        public BuildServiceProvider(DirectoryBuildContextFactory buildContextFactory, ILogger<PackBuildService> buildLogger, PakFileProvider pakFileProvider) {
+            _buildContextFactory = buildContextFactory;
+            _buildLogger = buildLogger;
+            _pakFileProvider = pakFileProvider;
+        }
+        public async Task<IBuildService> GetBuild(string? buildId) {
+            return new PackBuildService(_buildContextFactory.CreateContext(buildId), _buildLogger, _pakFileProvider);
+        }
+    }
+}

src/PackCreator/CoreExtensions.cs

@@ -5,6 +5,7 @@
 using System.Linq;
 using System.Reflection;
 using AceCore;
+using BuildEngine.Builder;
 
 namespace PackCreator {
     public static class CoreExtensions {
@@ -32,29 +33,6 @@ public static BuildInstruction GetInstruction(this SkinIdentifier skinIdentifier
             return instr;
         }
 
-        /* public static IEnumerable<DirectoryInfo> GetModFileNodes(this DirectoryInfo root) {
-            var folderWithoutSubfolder = Directory.EnumerateDirectories(root.FullName, "*.*", SearchOption.AllDirectories)
-                .Where(f => {
-                    var files = Directory.EnumerateFiles(f, "*.*", SearchOption.TopDirectoryOnly);
-                    return (!Directory.EnumerateDirectories(f, "*.*", SearchOption.TopDirectoryOnly).Any()) && files.Any() && !files.All(a => Path.GetExtension(a) == ".pak") && new DirectoryInfo(f).Name != "ex" && !f.Contains("\\_meta\\");
-                });
-            return folderWithoutSubfolder.Select(fs => IsSlotFolder(fs) ? Directory.GetParent(fs) : new DirectoryInfo(fs)).Select(f => f.FullName).Distinct().Select(p => new DirectoryInfo(p)).ToList();
-        }
-
-        public static IEnumerable<DirectoryInfo> GetModFileNodes(this DirectoryInfo root, string rootPattern) {
-            var folderWithoutSubfolder = Directory.EnumerateDirectories(root.FullName, rootPattern, SearchOption.TopDirectoryOnly).SelectMany( td => Directory.EnumerateDirectories(td, "*", SearchOption.AllDirectories)
-                .Where(f => {
-                    var files = Directory.EnumerateFiles(f, "*.*", SearchOption.TopDirectoryOnly);
-                    return (!Directory.EnumerateDirectories(f, "*.*", SearchOption.TopDirectoryOnly).Any()) && files.Any() && !files.All(a => Path.GetExtension(a) == ".pak") && new DirectoryInfo(f).Name != "ex";
-                }));
-            return folderWithoutSubfolder.Select(fs => IsSlotFolder(fs) ? Directory.GetParent(fs) : new DirectoryInfo(fs)).Select(f => f.FullName).Distinct().Select(p => new DirectoryInfo(p)).ToList();
-        }
-
-        internal static bool IsSlotFolder(this string folderName) {
-            var leafName = Path.GetFileName(folderName);
-            return leafName == "Materials" || leafName == "Textures" || leafName.Any(char.IsDigit);
-        } */
-
         public static void CopyTo(this DirectoryInfo sourceDirectory, DirectoryInfo targetDirectory, string fileFilter) {
 
             CopyAll(sourceDirectory, targetDirectory, fileFilter);