Merge branch 'dev' into release

Mutagen-Modding · Oct 12, 2020 · 726452d · 726452d
2 parents f8d06a2 + 671d77f
commit 726452d
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,6 +2,6 @@
   <PropertyGroup>
     <Nullable>enable</Nullable>
     <WarningsAsErrors>nullable</WarningsAsErrors>
-    <Version>0.10</Version>
+    <Version>0.10.1</Version>
   </PropertyGroup>
 </Project>
diff --git 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", "[email protected]", DateTimeOffset.Now);
                             Commands.Pull(repo, author, null);
                             tags = repo.Tags.Select(tag => tag.FriendlyName).WithIndex().ToList();
                         }

diff --git 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)