From 411e6510e34b1215c7a083c15fc577c857ee9a1c Mon Sep 17 00:00:00 2001
From: dymanoid <9433345+dymanoid@users.noreply.github.com>
Date: Sat, 11 Apr 2020 21:05:38 +0200
Subject: [PATCH] Switch to SkyTools NuGet packages

The submodule 'SkyTools' was removed.
Instead, the NuGet packages SkyTools.Common and SkyTools.Patching
will be used.
---
 .gitmodules                      |  3 ---
 src/RealTime.sln                 | 12 ++----------
 src/RealTime/Core/RealTimeMod.cs |  8 +++-----
 src/RealTime/RealTime.csproj     |  4 +---
 src/SkyTools                     |  1 -
 5 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 src/SkyTools

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 1bed5dd8..00000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "src/SkyTools"]
-	path = src/SkyTools
-	url = https://github.com/dymanoid/SkyTools.git
diff --git a/src/RealTime.sln b/src/RealTime.sln
index 99c00cdd..a6224bfa 100644
--- a/src/RealTime.sln
+++ b/src/RealTime.sln
@@ -3,11 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29519.87
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealTime", "RealTime\RealTime.csproj", "{7CD7702C-E7D3-4E61-BF3A-B10F7950DE52}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RealTime", "RealTime\RealTime.csproj", "{7CD7702C-E7D3-4E61-BF3A-B10F7950DE52}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RealTimeTests", "RealTimeTests\RealTimeTests.csproj", "{687CE9B5-2E2E-454E-83FC-512250CACF3E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SkyTools", "SkyTools\src\SkyTools\SkyTools.csproj", "{F83D96EF-857A-4AA4-8C23-7D258DAD777D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RealTimeTests", "RealTimeTests\RealTimeTests.csproj", "{687CE9B5-2E2E-454E-83FC-512250CACF3E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{7B555ECE-12A0-4F46-947F-781C8C52FD92}"
 	ProjectSection(SolutionItems) = preProject
@@ -36,12 +34,6 @@ Global
 		{687CE9B5-2E2E-454E-83FC-512250CACF3E}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{687CE9B5-2E2E-454E-83FC-512250CACF3E}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{687CE9B5-2E2E-454E-83FC-512250CACF3E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F83D96EF-857A-4AA4-8C23-7D258DAD777D}.Benchmark|Any CPU.ActiveCfg = Debug|Any CPU
-		{F83D96EF-857A-4AA4-8C23-7D258DAD777D}.Benchmark|Any CPU.Build.0 = Debug|Any CPU
-		{F83D96EF-857A-4AA4-8C23-7D258DAD777D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F83D96EF-857A-4AA4-8C23-7D258DAD777D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F83D96EF-857A-4AA4-8C23-7D258DAD777D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F83D96EF-857A-4AA4-8C23-7D258DAD777D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/RealTime/Core/RealTimeMod.cs b/src/RealTime/Core/RealTimeMod.cs
index 92b875af..a595652d 100644
--- a/src/RealTime/Core/RealTimeMod.cs
+++ b/src/RealTime/Core/RealTimeMod.cs
@@ -1,4 +1,4 @@
-// <copyright file="RealTimeMod.cs" company="dymanoid">Copyright (c) dymanoid. All rights reserved.</copyright>
+// <copyright file="RealTimeMod.cs" company="dymanoid">Copyright (c) dymanoid. All rights reserved.</copyright>
 
 namespace RealTime.Core
 {
@@ -48,9 +48,7 @@ public RealTimeMod()
         /// <summary>Called when this mod is enabled.</summary>
         public void OnEnabled()
         {
-#if DEBUG
-            Log.Setup(LogCategory.Generic, LogCategory.Simulation);
-#endif
+            Log.SetupDebug(Name, LogCategory.Generic, LogCategory.Simulation);
 
             if (string.IsNullOrEmpty(modPath))
             {
@@ -232,4 +230,4 @@ private void CloseConfigUI()
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/RealTime/RealTime.csproj b/src/RealTime/RealTime.csproj
index 015e8880..c35c4ab6 100644
--- a/src/RealTime/RealTime.csproj
+++ b/src/RealTime/RealTime.csproj
@@ -18,6 +18,7 @@
     <DefineConstants>BENCHMARK</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
+    <PackageReference Include="SkyTools.Patching" Version="2.1.0" />
     <PackageReference Include="GitVersionTask" Version="5.2.4" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" />
     <PackageReference Include="Roslynator.Analyzers" Version="2.3.0"/>
@@ -30,9 +31,6 @@
     <Reference Include="ICities" />
     <Reference Include="UnityEngine" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\SkyTools\src\SkyTools\SkyTools.csproj" />
-  </ItemGroup>
   <Target Name="DeployToModsDirectory" AfterTargets="Build" DependsOnTargets="Build">
     <PropertyGroup>
       <CitiesSkylinesModDir>D:\Data\SteamLibrary\steamapps\workshop\content\255710\1420955187\</CitiesSkylinesModDir>
diff --git a/src/SkyTools b/src/SkyTools
deleted file mode 160000
index 6de47197..00000000
--- a/src/SkyTools
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 6de47197a7fa1f7a62f472c95565797d4fdec176