From d125f5bdba26399b4386d9f604745df8a5bd57b9 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Mon, 12 Oct 2020 18:48:57 -0500 Subject: [PATCH 1/2] Driver repo checkout no longer uses global git config Was causing null refs on people that had not previously used git --- Directory.Build.props | 2 +- Synthesis.Bethesda.GUI/ViewModels/Config/GitPatcherVM.cs | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Directory.Build.props b/Directory.Build.props index b9706996..3e461d73 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -2,6 +2,6 @@ enable nullable - 0.10 + 0.10.1 diff --git a/Synthesis.Bethesda.GUI/ViewModels/Config/GitPatcherVM.cs b/Synthesis.Bethesda.GUI/ViewModels/Config/GitPatcherVM.cs index 820083b6..7eb1a99e 100644 --- a/Synthesis.Bethesda.GUI/ViewModels/Config/GitPatcherVM.cs +++ b/Synthesis.Bethesda.GUI/ViewModels/Config/GitPatcherVM.cs @@ -150,8 +150,7 @@ public GitPatcherVM(ProfileVM parent, GithubPatcherSettings? settings = null) masterBranch = master.FriendlyName; repo.Reset(ResetMode.Hard); Commands.Checkout(repo, master); - Configuration config = repo.Config; - Signature author = config.BuildSignature(DateTimeOffset.Now); + Signature author = new Signature("please", "whymustidothis@gmail.com", DateTimeOffset.Now); Commands.Pull(repo, author, null); tags = repo.Tags.Select(tag => tag.FriendlyName).WithIndex().ToList(); } From 671d77fc7ced4f4a0dcddd585e50719177c194e9 Mon Sep 17 00:00:00 2001 From: Justin Swanson Date: Mon, 12 Oct 2020 18:51:55 -0500 Subject: [PATCH 2/2] Switched version display to show file version info --- Synthesis.Bethesda.GUI/ViewModels/MainVM.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Synthesis.Bethesda.GUI/ViewModels/MainVM.cs b/Synthesis.Bethesda.GUI/ViewModels/MainVM.cs index 8f72c00b..dc7e2fc8 100644 --- a/Synthesis.Bethesda.GUI/ViewModels/MainVM.cs +++ b/Synthesis.Bethesda.GUI/ViewModels/MainVM.cs @@ -11,6 +11,7 @@ using Noggog; using Mutagen.Bethesda; using Synthesis.Bethesda.Execution.Settings; +using System.Diagnostics; namespace Synthesis.Bethesda.GUI { @@ -87,8 +88,8 @@ public MainVM() Task.Run(() => Mutagen.Bethesda.WarmupAll.Init()).FireAndForget(); - SynthesisVersion = typeof(Synthesis.Bethesda.Constants).Assembly.GetName().Version!.ToString().TrimEnd(".0").TrimEnd(".0"); - MutagenVersion = typeof(FormKey).Assembly.GetName().Version!.ToString().TrimEnd(".0").TrimEnd(".0"); + SynthesisVersion = FileVersionInfo.GetVersionInfo(typeof(Synthesis.Bethesda.Constants).Assembly.Location)!.ProductVersion.TrimEnd(".0").TrimEnd(".0"); + MutagenVersion = FileVersionInfo.GetVersionInfo(typeof(FormKey).Assembly.Location)!.ProductVersion.TrimEnd(".0").TrimEnd(".0"); } public void Load(SynthesisGuiSettings? guiSettings, PipelineSettings? pipeSettings)