Skip to content

Commit

Permalink
Switch to SkyTools NuGet packages
Browse files Browse the repository at this point in the history
The submodule 'SkyTools' was removed.
Instead, the NuGet packages SkyTools.Common and SkyTools.Patching
will be used.
  • Loading branch information
dymanoid committed Apr 11, 2020
1 parent 0703f56 commit 411e651
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 22 deletions.
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

12 changes: 2 additions & 10 deletions src/RealTime.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions src/RealTime/Core/RealTimeMod.cs
Original file line number Diff line number Diff line change
@@ -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
{
Expand Down Expand Up @@ -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))
{
Expand Down Expand Up @@ -232,4 +230,4 @@ private void CloseConfigUI()
}
}
}
}
}
4 changes: 1 addition & 3 deletions src/RealTime/RealTime.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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>
Expand Down
1 change: 0 additions & 1 deletion src/SkyTools
Submodule SkyTools deleted from 6de471

0 comments on commit 411e651

Please sign in to comment.