Refactor build system... again

This is the last time I ever want to have to do this. This was awful, but it works. And it works *so* well.
Insprill · Jun 16, 2023 · 40462ef · 40462ef
1 parent 13315b4
commit 40462ef
Show file tree

Hide file tree

Showing 61 changed files with 231 additions and 120 deletions.
diff --git a/.gitignore b/.gitignore
@@ -289,8 +289,8 @@ Mapify_*.zip
 # User-specific refrence paths
 Directory.Build.targets
 
-# User-specific environment variables
-.env*
+# User-specific properties
+UserProperties.props
 
 # Custom map used for testing
 TestMap/

diff --git a/Mapify.sln b/Mapify.sln
@@ -6,17 +6,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBD}") = "MapifyEditor", "MapifyEdito
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 		{57D181A9-9D9D-4EBA-BBDD-9172EEB79983}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57D181A9-9D9D-4EBA-BBDD-9172EEB79983}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57D181A9-9D9D-4EBA-BBDD-9172EEB79983}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57D181A9-9D9D-4EBA-BBDD-9172EEB79983}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{57D181A9-9D9D-4EBA-BBDD-9172EEB79984}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{57D181A9-9D9D-4EBA-BBDD-9172EEB79984}.Release|Any CPU.Build.0 = Release|Any CPU
-		{57D181A9-9D9D-4EBA-BBDD-9172EEB79984}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{57D181A9-9D9D-4EBA-BBDD-9172EEB79984}.Debug|Any CPU.Build.0 = Debug|Any CPU
 	EndGlobalSection
 EndGlobal
diff --git a/Mapify/Components/DisableOnAwake.cs b/Mapify/Components/DisableOnAwake.cs
@@ -3,7 +3,7 @@
 namespace Mapify.Components
 {
     /// <summary>
-    /// Disables the attached <see cref="GameObject"/> when Awake is called.
+    ///     Disables the attached <see cref="GameObject" /> when Awake is called.
     /// </summary>
     public class DisableOnAwake : MonoBehaviour
     {

diff --git a/Mapify/Map/Maps.cs b/Mapify/Map/Maps.cs
@@ -19,8 +19,8 @@ public static class Maps
 
         public static MapInfo LoadedMap {
             get {
-                if (_loadedMap == null) throw new InvalidOperationException("No map has been loaded!");
-
+                if (_loadedMap == null)
+                    throw new InvalidOperationException("No map has been loaded!");
                 return _loadedMap;
             }
             private set => _loadedMap = value;

diff --git a/Mapify/Mapify.cs b/Mapify/Mapify.cs
@@ -49,7 +49,7 @@ private void Awake()
             }
             catch (Exception ex)
             {
-                LogException($"Failed to load", ex);
+                LogException("Failed to load", ex);
                 Destroy(this);
             }
         }

diff --git a/Mapify/Mapify.csproj b/Mapify/Mapify.csproj
@@ -1,15 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
+    <Import Project="../UserProperties.props" Condition="Exists('../UserProperties.props')"/>
     <PropertyGroup>
-        <TargetFramework>netframework4.8</TargetFramework>
+        <TargetFramework>netstandard2.0</TargetFramework>
         <LangVersion>7.3</LangVersion>
         <RootNamespace>Mapify</RootNamespace>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
 
-    <ItemGroup>
-        <PackageReference Include="Microsoft.CSharp" Version="4.7.0"/>
-    </ItemGroup>
-
     <ItemGroup>
         <ProjectReference Include="../MapifyEditor/MapifyEditor.csproj"/>
     </ItemGroup>
@@ -50,10 +47,8 @@
     </ItemGroup>
 
     <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-        <Exec Condition="'$(OS)' != 'Windows_NT'" Command="mkdir -p ../build &amp;&amp; cp &quot;$(TargetPath)&quot; ../build/"/>
-        <Exec Condition="'$(OS)' != 'Windows_NT'" Command="../copy_build $(ProjectDir)"/>
-
-        <Exec Condition="'$(OS)' == 'Windows_NT'" Command="xcopy /d /y &quot;$(TargetPath)&quot; ..\build\"/>
-        <Exec Condition="'$(OS)' == 'Windows_NT'" Command="setlocal enabledelayedexpansion &amp;&amp; set DEST=C:\Program Files (x86)\Steam\steamapps\common\Derail Valley\Mods\Mapify &amp;&amp; if exist !DEST! xcopy /d /y &quot;$(TargetPath)&quot; &quot;!DEST!&quot;"/>
+        <!-- Copy files -->
+        <Copy SourceFiles="$(TargetPath)" DestinationFolder="../build/runtime"/>
+        <Copy Condition="'$(IsEditor)' != 'true' And Exists('$(DvInstallDir)')" SourceFiles="$(TargetPath)" DestinationFolder="$(DvInstallDir)"/>
     </Target>
 </Project>
diff --git a/Mapify/SceneInitializers/RailwaySceneInitializer.cs b/Mapify/SceneInitializers/RailwaySceneInitializer.cs
@@ -79,7 +79,7 @@ private static void CreateJunction(Switch sw)
         {
             Transform swTransform = sw.transform;
             VanillaAsset vanillaAsset = sw.GetComponent<VanillaObject>().asset;
-            GameObject prefabClone = AssetCopier.Instantiate(vanillaAsset, active: false);
+            GameObject prefabClone = AssetCopier.Instantiate(vanillaAsset, false);
             Transform prefabCloneTransform = prefabClone.transform;
             Transform inJunction = prefabCloneTransform.Find("in_junction");
             Vector3 offset = prefabCloneTransform.position - inJunction.position;

diff --git a/Mapify/Utils/Extensions.cs b/Mapify/Utils/Extensions.cs
@@ -185,7 +185,8 @@ public static float ScaleNumber(this float value, float minValue, float maxValue
         #region DV
 
         private static readonly MethodInfo CommandArg_Method_TypeError = AccessTools.DeclaredMethod(typeof(CommandArg), "TypeError", new[] { typeof(string) });
-        private static readonly MethodInfo DisplayLoadingInfo_Method_OnLoadingStatusChanged = AccessTools.DeclaredMethod(typeof(DisplayLoadingInfo), "OnLoadingStatusChanged", new[] { typeof(string), typeof(bool), typeof(float) });
+        private static readonly MethodInfo DisplayLoadingInfo_Method_OnLoadingStatusChanged =
+            AccessTools.DeclaredMethod(typeof(DisplayLoadingInfo), "OnLoadingStatusChanged", new[] { typeof(string), typeof(bool), typeof(float) });
 
         public static double Double(this CommandArg arg)
         {

diff --git a/MapifyEditor/BezierCurves/BezierCurveEditor.cs b/MapifyEditor/BezierCurves/BezierCurveEditor.cs
@@ -6,6 +6,7 @@ This script was adapted from the free Unity Asset Store asset "Bezier Curve Edit
 
 */
 
+#if UNITY_EDITOR
 using UnityEditor;
 using UnityEngine;
 
@@ -251,3 +252,4 @@ public static void DrawOtherPoints(BezierCurve curve, BezierPoint caller)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/BezierCurves/BezierPointEditor.cs b/MapifyEditor/BezierCurves/BezierPointEditor.cs
@@ -6,6 +6,7 @@ This script was adapted from the free Unity Asset Store asset "Bezier Curve Edit
 
 */
 
+#if UNITY_EDITOR
 using UnityEditor;
 using UnityEngine;
 
@@ -178,3 +179,4 @@ private static void HandleAbsent(BezierPoint p)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/BuildUpdater.cs b/MapifyEditor/Export/BuildUpdaters/BuildUpdater.cs
@@ -1,4 +1,5 @@
-using System;
+#if UNITY_EDITOR
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -109,3 +110,4 @@ private static BuildUpdater[] FindUpdaters()
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/GameContent/RestrictedComponentsUpdater.cs b/MapifyEditor/Export/BuildUpdaters/GameContent/RestrictedComponentsUpdater.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
@@ -36,3 +37,4 @@ protected override void Cleanup(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/GameContent/StationUpdater.cs b/MapifyEditor/Export/BuildUpdaters/GameContent/StationUpdater.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 using UnityEngine;
@@ -63,3 +64,4 @@ protected override void Cleanup(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Railway/BufferStopUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Railway/BufferStopUpdater.cs
@@ -1,4 +1,5 @@
-using Mapify.Editor.Utils;
+#if UNITY_EDITOR
+using Mapify.Editor.Utils;
 using UnityEngine;
 
 namespace Mapify.Editor.StateUpdaters
@@ -15,3 +16,4 @@ protected override void Update(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Railway/LocomotiveSpawnerUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Railway/LocomotiveSpawnerUpdater.cs
@@ -1,4 +1,5 @@
-using System.Linq;
+#if UNITY_EDITOR
+using System.Linq;
 using Mapify.Editor.Utils;
 
 namespace Mapify.Editor.StateUpdaters
@@ -12,3 +13,4 @@ protected override void Update(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Railway/SwitchUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Railway/SwitchUpdater.cs
@@ -1,4 +1,5 @@
-using Mapify.Editor.Utils;
+#if UNITY_EDITOR
+using Mapify.Editor.Utils;
 
 namespace Mapify.Editor.StateUpdaters
 {
@@ -20,3 +21,4 @@ protected override void Update(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Railway/TrackUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Railway/TrackUpdater.cs
@@ -1,4 +1,5 @@
-using Mapify.Editor.Utils;
+#if UNITY_EDITOR
+using Mapify.Editor.Utils;
 
 namespace Mapify.Editor.StateUpdaters
 {
@@ -21,3 +22,4 @@ protected override void Update(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Streaming/StreamingUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Streaming/StreamingUpdater.cs
@@ -1,6 +1,7 @@
 using Mapify.Editor.Utils;
 using UnityEngine;
 
+#if UNITY_EDITOR
 namespace Mapify.Editor.StateUpdaters
 {
     public class StreamingUpdater : BuildUpdater
@@ -18,3 +19,4 @@ protected override void Cleanup(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Terrain/TerrainMapInfoUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Terrain/TerrainMapInfoUpdater.cs
@@ -1,4 +1,6 @@
-using Mapify.Editor.Utils;
+#if UNITY_EDITOR
+
+using Mapify.Editor.Utils;
 using UnityEngine;
 
 namespace Mapify.Editor.StateUpdaters
@@ -28,3 +30,4 @@ protected override void Update(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/BuildUpdaters/Terrain/TerrainSceneUpdater.cs b/MapifyEditor/Export/BuildUpdaters/Terrain/TerrainSceneUpdater.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Linq;
 using Mapify.Editor.Utils;
 using UnityEngine;
@@ -16,3 +17,4 @@ protected override void Update(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Gui/ExportMapGui.cs b/MapifyEditor/Export/Gui/ExportMapGui.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using UnityEditor;
 using UnityEngine;
 
@@ -69,3 +70,4 @@ private void OnGUI()
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Gui/MapValidationGui.cs b/MapifyEditor/Export/Gui/MapValidationGui.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 using Mapify.Editor.Validators;
@@ -79,3 +80,4 @@ private void DrawResults(IEnumerable<Result> results, string color, GUIStyle sty
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/MapExporter.cs b/MapifyEditor/Export/MapExporter.cs
@@ -1,4 +1,5 @@
-using System;
+#if UNITY_EDITOR
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.IO.Compression;
@@ -245,3 +246,4 @@ private static string GetLinuxMapsFolder()
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/GameContent/LightValidator.cs b/MapifyEditor/Export/Validators/GameContent/LightValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 using UnityEngine;
@@ -16,3 +17,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/GameContent/ServiceStationValidator.cs b/MapifyEditor/Export/Validators/GameContent/ServiceStationValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 using UnityEngine;
@@ -40,3 +41,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/GameContent/StationValidator.cs b/MapifyEditor/Export/Validators/GameContent/StationValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 
@@ -53,3 +54,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/GameContent/StoreValidator.cs b/MapifyEditor/Export/Validators/GameContent/StoreValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 
@@ -45,3 +46,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/GameContent/WarehouseMachineValidator.cs b/MapifyEditor/Export/Validators/GameContent/WarehouseMachineValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor.Utils;
 
@@ -27,3 +28,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/Project/MapInfoValidator.cs b/MapifyEditor/Export/Validators/Project/MapInfoValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Text.RegularExpressions;
 using Mapify.Editor;
 using Mapify.Editor.Utils;
@@ -44,3 +45,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/Project/UnityVersionValidator.cs b/MapifyEditor/Export/Validators/Project/UnityVersionValidator.cs
@@ -1,3 +1,4 @@
+#if UNITY_EDITOR
 using System.Collections.Generic;
 using Mapify.Editor;
 using Mapify.Editor.Validators;
@@ -13,3 +14,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/Project/VrSettingsValidator.cs b/MapifyEditor/Export/Validators/Project/VrSettingsValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using System.Linq;
 using Mapify.Editor;
 using Mapify.Editor.Validators;
@@ -21,3 +22,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
diff --git a/MapifyEditor/Export/Validators/Railway/BufferStopValidator.cs b/MapifyEditor/Export/Validators/Railway/BufferStopValidator.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+#if UNITY_EDITOR
+using System.Collections.Generic;
 using Mapify.Editor;
 using Mapify.Editor.Utils;
 using Mapify.Editor.Validators;
@@ -23,3 +24,4 @@ protected override IEnumerator<Result> Validate(Scenes scenes)
         }
     }
 }
+#endif
-Original file line number
+Diff line change
@@ Expand Up @@
     */
+    #if UNITY_EDITOR
     using UnityEditor;
     using UnityEngine;
@@ Expand Down Expand Up @@
             }
         }
     }
+    #endif