Don't override Doorstop target assembly if not configured for mod loading.

Author: DarkDaskin

UnityModStudio.Build/Tasks/ConfigureDoorstop.cs

@@ -1,68 +1,77 @@
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using Microsoft.Build.Framework;
 using Microsoft.Build.Utilities;
 
-namespace UnityModStudio.Build.Tasks
+namespace UnityModStudio.Build.Tasks;
+
+public class ConfigureDoorstop : Task
 {
-    public class ConfigureDoorstop : Task
+    [Required]
+    public ITaskItem? ConfigPath { get; set; }
+
+    public ITaskItem? TargetAssemblyPath { get; set; }
+
+    public bool UseForModLoading { get; set; }
+
+    public override bool Execute()
     {
-        [Required]
-        public ITaskItem? ConfigPath { get; set; }
+        var configPath = ConfigPath!.GetMetadata("FullPath");
+        if (!File.Exists(configPath))
+        {
+            Log.LogError("Unity Doorstop config file does not exist.");
+            return false;
+        }
 
-        [Required]
-        public ITaskItem? TargetAssemblyPath { get; set; }
+        var values = new List<(string, string)>
+        {
+            ("enabled", "true")
+        };
 
-        public override bool Execute()
+        if (UseForModLoading)
         {
-            var configPath = ConfigPath!.GetMetadata("FullPath");
-            if (!File.Exists(configPath))
-            {
-                Log.LogError("Unity Doorstop config file does not exist.");
-                return false;
-            }
-            var targetAssemblyPath = TargetAssemblyPath!.GetMetadata("FullPath");
+            var targetAssemblyPath = TargetAssemblyPath?.GetMetadata("FullPath");
             if (!File.Exists(targetAssemblyPath))
             {
                 Log.LogError("Target assembly file does not exist.");
                 return false;
             }
+            values.Add(("target_assembly", GetRelativePath(targetAssemblyPath!, configPath)));
+        }
 
-            SetIniValues(configPath, "General", 
-                ("enabled", "true"),
-                ("target_assembly", GetRelativePath(targetAssemblyPath, configPath)));
+        SetIniValues(configPath, "General", values);
 
-            return true;
-        }
+        return true;
+    }
 
-        private static string GetRelativePath(string path, string relativeToPath) =>
-            new Uri(Path.GetFullPath(relativeToPath))
-                .MakeRelativeUri(new Uri(Path.GetFullPath(path))).ToString()
-                .Replace('/', Path.DirectorySeparatorChar);
+    private static string GetRelativePath(string path, string relativeToPath) =>
+        new Uri(Path.GetFullPath(relativeToPath))
+            .MakeRelativeUri(new Uri(Path.GetFullPath(path))).ToString()
+            .Replace('/', Path.DirectorySeparatorChar);
 
-        private static readonly char[] IniEntrySeparator = {'='};
-        private static readonly char[] IniCommentSeparator = {'#'};
+    private static readonly char[] IniEntrySeparator = ['='];
+    private static readonly char[] IniCommentSeparator = ['#'];
 
-        private static void SetIniValues(string iniFilePath, string section, params (string key, string value)[] values)
-        {
-            var lines = File.ReadAllLines(iniFilePath);
-            var linesInSection = lines
-                .Select((line, index) => (text: line.TrimStart(), index))
-                .SkipWhile(line => !line.text.StartsWith($"[{section}]"))
-                .Skip(1)
-                .TakeWhile(line => !line.text.StartsWith("["));
-            var linesToChange =
-                from line in linesInSection
-                where !line.text.StartsWith("#")
-                let parts = line.text.Split(IniEntrySeparator, 2)
-                where parts.Length > 1
-                let comment = parts[1].Split(IniCommentSeparator, 2).ElementAtOrDefault(1)
-                join kv in values on parts[0] equals kv.key 
-                select (line.index, kv.key, kv.value, comment);
-            foreach (var (index, key, value, comment) in linesToChange)
-                lines[index] = $"{key}={value}" + (comment != null ? $" # {comment}" : "");
-            File.WriteAllLines(iniFilePath, lines);
-        }
+    private static void SetIniValues(string iniFilePath, string section, IEnumerable<(string key, string value)> values)
+    {
+        var lines = File.ReadAllLines(iniFilePath);
+        var linesInSection = lines
+            .Select((line, index) => (text: line.TrimStart(), index))
+            .SkipWhile(line => !line.text.StartsWith($"[{section}]"))
+            .Skip(1)
+            .TakeWhile(line => !line.text.StartsWith("["));
+        var linesToChange =
+            from line in linesInSection
+            where !line.text.StartsWith("#")
+            let parts = line.text.Split(IniEntrySeparator, 2)
+            where parts.Length > 1
+            let comment = parts[1].Split(IniCommentSeparator, 2).ElementAtOrDefault(1)
+            join kv in values on parts[0] equals kv.key 
+            select (line.index, kv.key, kv.value, comment);
+        foreach (var (index, key, value, comment) in linesToChange)
+            lines[index] = $"{key}={value}" + (comment != null ? $" # {comment}" : "");
+        File.WriteAllLines(iniFilePath, lines);
     }
 }

UnityModStudio.Build/build/UnityModStudio.Build.targets

@@ -462,9 +462,11 @@
   <Target Name="ConfigureDoorstop" AfterTargets="CopyModFilesToGame;LinkModToGame" DependsOnTargets="DeployDoorstop;PrepareModPaths" Condition="'$(DoorstopMode)' != '' and '$(DoorstopMode)' != 'Disabled'">
     <PropertyGroup>
       <DoorstopConfigFile>$(GamePath)doorstop_config.ini</DoorstopConfigFile>
+      <_UseDoorstopForModLoading>false</_UseDoorstopForModLoading>
+      <_UseDoorstopForModLoading Condition="'$(DoorstopMode)' == 'DebuggingAndModLoading'">true</_UseDoorstopForModLoading>
     </PropertyGroup>
 
-    <ConfigureDoorstop ConfigPath="$(DoorstopConfigFile)" TargetAssemblyPath="$(DeployedModAssemblyPath)" />
+    <ConfigureDoorstop ConfigPath="$(DoorstopConfigFile)" TargetAssemblyPath="$(DeployedModAssemblyPath)" UseForModLoading="$(_UseDoorstopForModLoading)" />
   </Target>
 
   <Target Name="AddGameToRegistry">