Automatic merge of X1.3.1-196-g253eec25a and 8 pull requests

- Pull request #40 at e81861b: Monogame upgrade - Pull request #79 at 7d9f14b: Update version calculation for new unstable versions - Pull request #226 at 26983e9: EmbedIO web server graphical track monitor - Pull request #227 at 6ec1539: EmbedIO web server graphical train driving monitor - Pull request #228 at 72c0146: adds links to OR on Elvas Tower - Pull request #232 at f119329: JSON consist format: https://blueprints.launchpad.net/or/+spec/consist-editor - Pull request #234 at 3ac34fe: Rehabilitate unit testing suite, migrate to xUnit 2 - Pull request #237 at abd68c3: Fixed 3D cab loading with undefined cabview control in CVF file https://bugs.launchpad.net/or/+bug/1888945
openrails · Jul 25, 2020 · adb2caf · adb2caf
10 parents be0cb2b + 253eec2 + e81861b + 7d9f14b + 26983e9 + 6ec1539 + 72c0146 + f119329 + 3ac34fe + abd68c3
commit adb2caf
Show file tree

Hide file tree

Showing 16 changed files with 21 additions and 13 deletions.
diff --git a/Source/Contrib/ActivityEditor/LibAE/Formats/ActivityInfo.cs b/Source/Contrib/ActivityEditor/LibAE/Formats/ActivityInfo.cs
@@ -30,7 +30,7 @@
 using MSTS;
 using Orts.Formats.Msts;
 using Orts.Parsers.Msts;
-using ORTS.Common;
+using ORTS.Content;
 using Orts.Formats.OR;
 
 namespace LibAE.Formats

diff --git a/Source/Contrib/ContentManager/ContentMSTS.cs b/Source/Contrib/ContentManager/ContentMSTS.cs
@@ -15,7 +15,7 @@
 // You should have received a copy of the GNU General Public License
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
-using ORTS.Common;
+using ORTS.Content;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/Source/Contrib/ContentManager/ContentManager.csproj b/Source/Contrib/ContentManager/ContentManager.csproj
@@ -96,11 +96,11 @@
       <Project>{570709FA-0C8A-4B1D-BA2D-D9455AFD9B5C}</Project>
       <Name>Orts.Formats.Msts</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj">
-      <Project>{DA94D876-7D35-46C3-AECE-AFACE72C686C}</Project>
-      <Name>ORTS.Common</Name>
+    <ProjectReference Include="..\..\ORTS.Content\ORTS.Content.csproj">
+      <Project>{812685a7-2683-4102-a3ca-2a5ced2e61ee}</Project>
+      <Name>ORTS.Content</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\Orts.Formats.OR\Orts.Formats.OR.csproj">
+      <ProjectReference Include="..\..\Orts.Formats.OR\Orts.Formats.OR.csproj">
       <Project>{0d8d312b-2c02-4b77-a795-566394a9db95}</Project>
       <Name>Orts.Formats.OR</Name>
     </ProjectReference>

diff --git a/Source/ORTS.Common/ORTS.Common.csproj b/Source/ORTS.Common/ORTS.Common.csproj
@@ -57,7 +57,6 @@
     <Compile Include="AlmostEqual.cs" />
     <Compile Include="CancellationToken.cs" />
     <Compile Include="CancellationTokenSource.cs" />
-    <Compile Include="TrainFile.cs" />
     <Compile Include="Conversions.cs" />
     <Compile Include="Coordinates.cs" />
     <Compile Include="DataLogger.cs" />

diff --git a/Source/ORTS.Content/ORTS.Content.csproj b/Source/ORTS.Content/ORTS.Content.csproj
@@ -41,6 +41,7 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="MSTSPath.cs" />
+    <Compile Include="TrainFile.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it.

diff --git a/Source/ORTS.Common/TrainFile.cs → Source/ORTS.Content/TrainFile.cs b/Source/ORTS.Common/TrainFile.cs → Source/ORTS.Content/TrainFile.cs
@@ -20,7 +20,7 @@
 using System.IO;
 using System.Linq;
 
-namespace ORTS.Common
+namespace ORTS.Content
 {
     /// <summary>
     /// An engine or wagon reference for loading by the simulator.

diff --git a/Source/ORTS.Menu/Activities.cs b/Source/ORTS.Menu/Activities.cs
@@ -19,7 +19,7 @@
 using System.IO;
 using GNU.Gettext;
 using Orts.Formats.Msts;
-using ORTS.Common;
+using ORTS.Content;
 using ORTS.Settings;
 
 namespace ORTS.Menu

diff --git a/Source/ORTS.Menu/Consists.cs b/Source/ORTS.Menu/Consists.cs
@@ -22,7 +22,7 @@
 using GNU.Gettext;
 using Orts.Formats.Msts;
 using Orts.Formats.OR;
-using ORTS.Common;
+using ORTS.Content;
 
 namespace ORTS.Menu
 {

diff --git a/Source/Orts.Formats.Msts/ConsistFile.cs b/Source/Orts.Formats.Msts/ConsistFile.cs
@@ -19,7 +19,7 @@
 using System.Diagnostics;
 using System.Linq;
 using Orts.Parsers.Msts;
-using ORTS.Common;
+using ORTS.Content;
 
 namespace Orts.Formats.Msts
 {

diff --git a/Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj b/Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj
@@ -81,6 +81,10 @@
     <Compile Include="TerrainAltitudeFile.cs" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj">
+      <Project>{812685a7-2683-4102-a3ca-2a5ced2e61ee}</Project>
+      <Name>ORTS.Content</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj">
       <Project>{8A84696C-3559-49B8-B27F-BB6932D8A1C6}</Project>
       <Name>Orts.Parsers.Msts</Name>

diff --git a/Source/Orts.Formats.OR/TrainFile.cs b/Source/Orts.Formats.OR/TrainFile.cs
@@ -18,7 +18,7 @@
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Orts.Formats.Msts;
-using ORTS.Common;
+using ORTS.Content;
 using System;
 using System.Collections.Generic;
 using System.IO;

diff --git a/Source/Orts.Simulation/Simulation/AIs/AI.cs b/Source/Orts.Simulation/Simulation/AIs/AI.cs
@@ -37,6 +37,7 @@
 using Orts.Simulation.Timetables;
 using Orts.Simulation.Signalling;
 using ORTS.Common;
+using ORTS.Content;
 using ORTS.Scripting.Api;
 using System;
 using System.Collections.Generic;

diff --git a/Source/Orts.Simulation/Simulation/GenericTrain.cs b/Source/Orts.Simulation/Simulation/GenericTrain.cs
@@ -16,7 +16,7 @@
 // along with Open Rails.  If not, see <http://www.gnu.org/licenses/>.
 
 using Orts.Simulation.RollingStocks;
-using ORTS.Common;
+using ORTS.Content;
 using ORTS.Settings;
 using System;
 using System.Collections.Generic;

diff --git a/Source/Orts.Simulation/Simulation/Simulator.cs b/Source/Orts.Simulation/Simulation/Simulator.cs
@@ -30,6 +30,7 @@
 using Orts.Simulation.Simulation;
 using Orts.Simulation.Timetables;
 using ORTS.Common;
+using ORTS.Content;
 using ORTS.Settings;
 using System;
 using System.Collections.Generic;

diff --git a/Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs b/Source/Orts.Simulation/Simulation/Timetables/ProcessTimetable.cs
@@ -33,6 +33,7 @@
 using Orts.Simulation.Signalling;
 using Orts.Simulation.Simulation;
 using ORTS.Common;
+using ORTS.Content;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;

diff --git a/Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs b/Source/RunActivity/Viewer3D/Processes/GameStateRunActivity.cs
@@ -27,6 +27,7 @@
 using Orts.Simulation.Simulation;
 using Orts.Viewer3D.Debugging;
 using ORTS.Common;
+using ORTS.Content;
 using ORTS.Settings;
 using System;
 using System.Collections.Generic;