Merge fixes

Mutagen-Modding · Aug 8, 2024 · f75c9da · f75c9da
1 parent 0d42102
commit f75c9da
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/Synthesis.Bethesda.Execution/Patchers/Git/ModifyProject/ModifyRunnerProjects.cs b/Synthesis.Bethesda.Execution/Patchers/Git/ModifyProject/ModifyRunnerProjects.cs
@@ -91,7 +91,6 @@ public void Modify(
                 out var curListedVersions);
             _turnOffNullability.TurnOff(projXml);
             _removeGitInfo.Remove(projXml);
-            _swapToProperNetVersion.Swap(projXml, targetMutagenNugetVersion);
             _turnOffWindowsSpec.TurnOff(projXml);
             System.Version.TryParse(TrimVersion(curListedVersions.Mutagen), out var mutaVersion);
             System.Version.TryParse(TrimVersion(curListedVersions.Synthesis), out var synthVersion);
@@ -106,6 +105,11 @@ public void Modify(
                 _removeProject.Remove(projXml, "Newtonsoft.Json");
             }
 
+            if (targetMutaVersion != null)
+            {
+                _swapToProperNetVersion.Swap(projXml, targetMutaVersion);
+            }
+
             if (targetMutaVersion != null && targetSynthesisVersion != null)
             {
                 _addAllReleasesToOldVersions.Add(projXml, synthVersion, targetMutaVersion, targetSynthesisVersion);

diff --git a/Synthesis.Bethesda.Execution/Patchers/Git/ModifyProject/SwapToProperNetVersion.cs b/Synthesis.Bethesda.Execution/Patchers/Git/ModifyProject/SwapToProperNetVersion.cs
@@ -6,15 +6,15 @@ namespace Synthesis.Bethesda.Execution.Patchers.Git.ModifyProject;
 
 public interface ISwapToProperNetVersion
 {
-    void Swap(XElement proj, NuGetVersion targetMutagenVersion);
+    void Swap(XElement proj, Version targetMutagenVersion);
 }
 
 public class SwapToProperNetVersion : ISwapToProperNetVersion
 {
     private const int NetNum = 8;
-    private readonly NuGetVersion Net8Version = new NuGetVersion(0, 45, 0);
+    private readonly Version Net8Version = new Version(0, 45);
 
-    private void ProcessTargetFrameworkNode(XElement elem, NuGetVersion targetMutagenVersion)
+    private void ProcessTargetFrameworkNode(XElement elem, Version targetMutagenVersion)
     {
         if (!elem.Name.LocalName.Equals("TargetFramework")) return;
         if (targetMutagenVersion < Net8Version)
@@ -36,7 +36,7 @@ private static void ProcessLegacy(XElement elem)
         }
     }
 
-    private static void ProcessNet8(XElement elem, NuGetVersion targetMutagenVersion)
+    private static void ProcessNet8(XElement elem, Version targetMutagenVersion)
     {
         if (!elem.Value.StartsWith("net"))
         {
@@ -52,7 +52,7 @@ private static void ProcessNet8(XElement elem, NuGetVersion targetMutagenVersion
         elem.Value = $"net{NetNum}.0";
     }
 
-    public void Swap(XElement proj, NuGetVersion targetMutagenVersion)
+    public void Swap(XElement proj, Version targetMutagenVersion)
     {
         foreach (var group in proj.Elements("PropertyGroup"))
         {