GameBundle/GameBundle.csproj

@@ -14,7 +14,7 @@
         <PackageIcon>Logo.png</PackageIcon>
         <PackAsTool>true</PackAsTool>
         <ToolCommandName>gamebundle</ToolCommandName>
-        <VersionPrefix>1.5.2</VersionPrefix>
+        <VersionPrefix>1.5.0</VersionPrefix>
     </PropertyGroup>
     
     <ItemGroup>

GameBundle/Options.cs

@@ -2,9 +2,8 @@ using System;
 using System.Collections.Generic;
 using CommandLine;
 
-namespace GameBundle;
+namespace GameBundle {
-
+    public class Options {
-public class Options {
 
         [Option('s', "source", HelpText = "The location of the .csproj file that should be built and bundled. By default, the current directory is scanned for one")]
         public string SourceFile { get; set; }
@@ -63,9 +62,6 @@ public class Options {
         public string BuildArgs { get; set; }
         [Option('n', "name-builds", HelpText = "Name the build output directories by the name of the executable")]
         public bool NameBuilds { get; set; }
-    [Option('N', "name-addition", HelpText = "An additional string of text that should be included in the names of the output directories")]
-    public string NameAddition { get; set; }
-    [Option('V', "include-version", HelpText = "Include the project's version in the names of the output directories")]
-    public bool IncludeVersion { get; set; }
 
+    }
 }

GameBundle/Program.cs

@@ -7,25 +7,24 @@ using System.Linq;
 using System.Text.RegularExpressions;
 using CommandLine;
 
-namespace GameBundle;
+namespace GameBundle {
-
+    internal static class Program {
-internal static class Program {
 
         private static int Main(string[] args) {
             return new Parser(c => {
                 c.HelpWriter = Console.Error;
                 c.EnableDashDash = true;
-        }).ParseArguments<Options>(args).MapResult(Program.Run, _ => -1);
+            }).ParseArguments<Options>(args).MapResult(Run, _ => -1);
         }
 
         private static int Run(Options options) {
             // make sure all of the required tools are installed
-        if (Program.RunProcess(options, "dotnet", "tool restore", AppDomain.CurrentDomain.BaseDirectory) != 0) {
+            if (RunProcess(options, "dotnet", "tool restore", AppDomain.CurrentDomain.BaseDirectory) != 0) {
                 Console.WriteLine("dotnet tool restore failed, aborting");
                 return -1;
             }
 
-        var proj = Program.GetProjectFile(options);
+            var proj = GetProjectFile(options);
             if (proj == null || !proj.Exists) {
                 Console.WriteLine("Project file not found, aborting");
                 return -1;
@@ -37,16 +36,16 @@ internal static class Program {
                 // regular builds
                 new("windows", "win", options.WindowsRid, options.BuildWindows),
                 new("linux", "linux", options.LinuxRid, options.BuildLinux),
-            new("mac", "mac", options.MacRid, options.BuildMac, false, d => options.MacBundle ? Program.CreateMacBundle(options, d) : 0),
+                new("mac", "mac", options.MacRid, options.BuildMac, false, d => options.MacBundle ? CreateMacBundle(options, d) : 0),
                 // arm builds
                 new("windows arm", "win-arm", options.WindowsArmRid, options.BuildWindowsArm, true),
                 new("linux arm", "linux-arm", options.LinuxArmRid, options.BuildLinuxArm, true),
-            new("mac arm", "mac-arm", options.MacArmRid, options.BuildMacArm, true, d => options.MacBundle ? Program.CreateMacBundle(options, d) : 0)
+                new("mac arm", "mac-arm", options.MacArmRid, options.BuildMacArm, true, d => options.MacBundle ? CreateMacBundle(options, d) : 0)
             };
             foreach (var config in toBuild) {
                 if (config.ShouldBuild) {
                     Console.WriteLine($"Bundling for {config.DisplayName}");
-                var res = Program.Publish(options, proj, config);
+                    var res = Publish(options, proj, config);
                     if (res != 0)
                         return res;
                     builtAnything = true;
@@ -60,8 +59,8 @@ internal static class Program {
         }
 
         private static int Publish(Options options, FileInfo proj, BuildConfig config) {
-        var buildDir = Program.GetBuildDir(options, config.DirectoryName);
+            var buildDir = GetBuildDir(options, config.DirectoryName);
-        var publishResult = Program.RunProcess(options, "dotnet", $"publish \"{proj.FullName}\" -o \"{buildDir.FullName}\" -r {config.Rid} --self-contained -c {options.BuildConfig} /p:PublishTrimmed={options.Trim} {options.BuildArgs}");
+            var publishResult = RunProcess(options, "dotnet", $"publish \"{proj.FullName}\" -o \"{buildDir.FullName}\" -r {config.Rid} --self-contained -c {options.BuildConfig} /p:PublishTrimmed={options.Trim} {options.BuildArgs}");
             if (publishResult != 0)
                 return publishResult;
 
@@ -69,31 +68,24 @@ internal static class Program {
             if (!options.SkipLib && !config.SkipLib) {
                 var excludes = $"\"{string.Join(";", options.ExcludedFiles)}\"";
                 var log = options.Verbose ? "Detail" : "Error";
-            var beautyResult = Program.RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True --noflag=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory);
+                var beautyResult = RunProcess(options, "dotnet", $"ncbeauty --loglevel={log} --force=True --noflag=True \"{buildDir.FullName}\" \"{options.LibFolder}\" {excludes}", AppDomain.CurrentDomain.BaseDirectory);
                 if (beautyResult != 0)
                     return beautyResult;
             }
 
-        // Add version if named builds are enabled
-        if (options.IncludeVersion) {
-            var version = Program.GetBuildVersion(buildDir);
-            if (version == null) {
-                Console.WriteLine("Couldn't determine build version, aborting");
-                return -1;
-            }
-            var dest = Path.Combine(buildDir.Parent.FullName, $"{version}-{buildDir.Name}");
-            Program.MoveDirectory(options, buildDir, dest);
-        }
-
             // Rename build folder if named builds are enabled
             if (options.NameBuilds) {
-            var name = Program.GetBuildName(buildDir);
+                var name = GetBuildName(options, buildDir);
                 if (name == null) {
                     Console.WriteLine("Couldn't determine build name, aborting");
                     return -1;
                 }
                 var dest = Path.Combine(buildDir.Parent.FullName, $"{name}-{buildDir.Name}");
-            Program.MoveDirectory(options, buildDir, dest);
+                if (Directory.Exists(dest))
+                    Directory.Delete(dest, true);
+                buildDir.MoveTo(dest);
+                if (options.Verbose)
+                    Console.WriteLine($"Moved build directory to {buildDir.FullName}");
             }
 
             // Run any additional actions like creating the mac bundle
@@ -141,13 +133,13 @@ internal static class Program {
         }
 
         private static int CreateMacBundle(Options options, DirectoryInfo buildDir) {
-        var buildName = Program.GetBuildName(buildDir);
+            var buildName = GetBuildName(options, buildDir);
             var app = buildDir.CreateSubdirectory($"{buildName}.app");
             var contents = app.CreateSubdirectory("Contents");
             var resources = contents.CreateSubdirectory("Resources");
             var macOs = contents.CreateSubdirectory("MacOS");
-        var resRegex = options.MacBundleResources.Select(Program.GlobRegex).ToArray();
+            var resRegex = options.MacBundleResources.Select(GlobRegex).ToArray();
-        var ignoreRegex = options.MacBundleIgnore.Select(Program.GlobRegex).ToArray();
+            var ignoreRegex = options.MacBundleIgnore.Select(GlobRegex).ToArray();
 
             if (options.Verbose)
                 Console.WriteLine($"Creating app bundle {app}");
@@ -184,44 +176,23 @@ internal static class Program {
             return new Regex(s.Replace(".", "[.]").Replace("*", ".*").Replace("?", "."));
         }
 
-    private static DirectoryInfo GetBuildDir(Options options, string name) {
+        private static DirectoryInfo GetBuildDir(Options options, string osName) {
-        if (options.NameAddition != null)
+            return new DirectoryInfo(Path.Combine(Path.GetFullPath(options.OutputDirectory), osName));
-            name = $"{options.NameAddition}-{name}";
-        return new DirectoryInfo(Path.Combine(Path.GetFullPath(options.OutputDirectory), name));
         }
 
-    private static string GetBuildName(DirectoryInfo buildDir) {
+        private static string GetBuildName(Options options, DirectoryInfo buildDir) {
-        return Path.GetFileNameWithoutExtension(Program.GetAssemblyFile(buildDir)?.Name);
+            // determine build name based on the names of the exe or binary that have a matching dll file
-    }
-
-    private static string GetBuildVersion(DirectoryInfo buildDir) {
-        var assemblyFile = Program.GetAssemblyFile(buildDir);
-        if (assemblyFile == null)
-            return null;
-        var version = FileVersionInfo.GetVersionInfo(assemblyFile.FullName);
-        return version.ProductVersion;
-    }
-
-    private static FileInfo GetAssemblyFile(DirectoryInfo buildDir) {
             var files = buildDir.GetFiles();
             foreach (var file in files) {
-            if (file.Extension != ".dll")
+                if (file.Extension != ".exe" && file.Extension != string.Empty)
                     continue;
-            // the assembly is (most likely) the dll file that has a matching binary or exe file in the same location
+                var name = Path.GetFileNameWithoutExtension(file.Name);
-            if (files.Any(f => f.Extension is ".exe" or "" && Path.GetFileNameWithoutExtension(f.Name) == Path.GetFileNameWithoutExtension(file.Name)))
+                if (files.Any(f => f.Extension == ".dll" && Path.GetFileNameWithoutExtension(f.Name) == name))
-                return file;
+                    return name;
             }
             return null;
         }
 
-    private static void MoveDirectory(Options options, DirectoryInfo dir, string dest) {
-        if (Directory.Exists(dest))
-            Directory.Delete(dest, true);
-        dir.MoveTo(dest!);
-        if (options.Verbose)
-            Console.WriteLine($"Moved build directory to {dir.FullName}");
-    }
-
         private readonly struct BuildConfig {
 
             public readonly string DisplayName;
@@ -242,4 +213,5 @@ internal static class Program {
 
         }
 
+    }
 }

Test/Bundle.bat

@@ -1,2 +1 @@
-rmdir /S /Q "bin/Bundled"
+"../GameBundle/bin/Debug/net6.0/GameBundle.exe" -wlmWL -bzn -s Test.csproj -o bin/Bundled -v --mac-bundle-ignore macmain.txt
-"../GameBundle/bin/Debug/net6.0/GameBundle.exe" -wlmWL -bznV -s Test.csproj -o bin/Bundled -v --mac-bundle-ignore macmain.txt -N beta

Test/GameImpl.cs

@@ -2,20 +2,19 @@ using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Graphics;
 using MLEM.Startup;
 
-namespace Test; 
+namespace Test {
-
+    public class GameImpl : MlemGame {
-public class GameImpl : MlemGame {
 
         public static GameImpl Instance { get; private set; }
         private Texture2D texture;
 
         public GameImpl() {
-        GameImpl.Instance = this;
+            Instance = this;
         }
 
         protected override void LoadContent() {
             base.LoadContent();
-        this.texture = MlemGame.LoadContent<Texture2D>("Textures/Test");
+            this.texture = LoadContent<Texture2D>("Textures/Test");
         }
 
         protected override void DoDraw(GameTime gameTime) {
@@ -26,4 +25,5 @@ public class GameImpl : MlemGame {
             this.SpriteBatch.End();
         }
 
+    }
 }

Test/Program.cs

@@ -1,9 +1,8 @@
 using Microsoft.Xna.Framework;
 using MLEM.Misc;
 
-namespace Test; 
+namespace Test {
-
+    public static class Program {
-public static class Program {
 
         public static void Main() {
             TextInputWrapper.Current = new TextInputWrapper.DesktopGl<TextInputEventArgs>((w, c) => w.TextInput += c);
@@ -11,4 +10,5 @@ public static class Program {
             game.Run();
         }
 
+    }
 }

Test/Test.csproj

@@ -6,7 +6,6 @@
         <PublishReadyToRun>false</PublishReadyToRun>
         <TieredCompilation>false</TieredCompilation>
         <AssemblyName>Test Project</AssemblyName>
-        <Version>1.2.3</Version>
     </PropertyGroup>
 
     <ItemGroup>
@@ -19,6 +18,6 @@
     <ItemGroup>
         <MonoGameContentReference Include="Content\Content.mgcb" />
         <Content Include="Content\*\**" />
-        <Content Include="macmain.txt" CopyToOutputDirectory="Always" />
+        <Content Include="macmain.txt" CopyToOutputDirectory="Always"/>
     </ItemGroup>
 </Project>