Skip to content

Commit 6dd0532

Browse files
mbm-ORmbm-OR
committed
Merge branch 'master' into TrainCarOperationsBugfixes
2 parents 379ad30 + 20e879b commit 6dd0532

File tree

93 files changed

+138
-139
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+138
-139
lines changed

‎Source/ContentChecker/ContentChecker.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1313
</PropertyGroup>
1414
<ItemGroup>
15-
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj" />
15+
<ProjectReference Include="..\Orts.Content\Orts.Content.csproj" />
1616
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
1717
<ProjectReference Include="..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
1818
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />

‎Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@
7878
<ProjectReference Include="..\..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
7979
<ProjectReference Include="..\..\..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
8080
<ProjectReference Include="..\..\..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
81-
<ProjectReference Include="..\..\..\ORTS.Common\ORTS.Common.csproj" />
82-
<ProjectReference Include="..\..\..\ORTS.Settings\ORTS.Settings.csproj" />
81+
<ProjectReference Include="..\..\..\Orts.Common\Orts.Common.csproj" />
82+
<ProjectReference Include="..\..\..\Orts.Settings\Orts.Settings.csproj" />
8383
<ProjectReference Include="..\LibAE\LibAE.csproj" />
8484
</ItemGroup>
8585
<ItemGroup>

‎Source/Contrib/ActivityEditor/LibAE/LibAE.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<ProjectReference Include="..\..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
2727
<ProjectReference Include="..\..\..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
2828
<ProjectReference Include="..\..\..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
29-
<ProjectReference Include="..\..\..\ORTS.Common\ORTS.Common.csproj" />
30-
<ProjectReference Include="..\..\..\ORTS.Content\ORTS.Content.csproj" />
31-
<ProjectReference Include="..\..\..\ORTS.Settings\ORTS.Settings.csproj" />
29+
<ProjectReference Include="..\..\..\Orts.Common\Orts.Common.csproj" />
30+
<ProjectReference Include="..\..\..\Orts.Content\Orts.Content.csproj" />
31+
<ProjectReference Include="..\..\..\Orts.Settings\Orts.Settings.csproj" />
3232
</ItemGroup>
3333
<ItemGroup>
3434
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">

‎Source/Contrib/ContentManager/ContentManager.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@
2323
</ItemGroup>
2424
<ItemGroup>
2525
<ProjectReference Include="..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
26-
<ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj" />
26+
<ProjectReference Include="..\..\Orts.Common\Orts.Common.csproj" />
2727
<ProjectReference Include="..\..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
2828
<ProjectReference Include="..\..\Orts.Parsers.OR\Orts.Parsers.OR.csproj" />
29-
<ProjectReference Include="..\..\ORTS.Settings\ORTS.Settings.csproj" />
29+
<ProjectReference Include="..\..\Orts.Settings\Orts.Settings.csproj" />
3030
</ItemGroup>
3131
<ItemGroup>
3232
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">

‎Source/Contrib/DataCollector/DataCollector.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
</PropertyGroup>
1717
<ItemGroup>
1818
<ProjectReference Include="..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
19-
<ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj" />
19+
<ProjectReference Include="..\..\Orts.Common\Orts.Common.csproj" />
2020
</ItemGroup>
2121
<ItemGroup>
2222
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">

‎Source/Contrib/SimulatorTester/SimulatorTester.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1616
</PropertyGroup>
1717
<ItemGroup>
18-
<ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj" />
19-
<ProjectReference Include="..\..\ORTS.Settings\ORTS.Settings.csproj" />
18+
<ProjectReference Include="..\..\Orts.Common\Orts.Common.csproj" />
19+
<ProjectReference Include="..\..\Orts.Settings\Orts.Settings.csproj" />
2020
<ProjectReference Include="..\..\Orts.Simulation\Orts.Simulation.csproj" />
2121
</ItemGroup>
2222
<ItemGroup>

‎Source/Contrib/TrackViewer/TrackViewer.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@
7979
</ItemGroup>
8080
<ItemGroup>
8181
<ProjectReference Include="..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
82-
<ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj" />
83-
<ProjectReference Include="..\..\ORTS.Content\ORTS.Content.csproj" />
84-
<ProjectReference Include="..\..\ORTS.Menu\ORTS.Menu.csproj" />
82+
<ProjectReference Include="..\..\Orts.Common\Orts.Common.csproj" />
83+
<ProjectReference Include="..\..\Orts.Content\Orts.Content.csproj" />
84+
<ProjectReference Include="..\..\Orts.Menu\Orts.Menu.csproj" />
8585
<ProjectReference Include="..\..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
86-
<ProjectReference Include="..\..\ORTS.Settings\ORTS.Settings.csproj" />
86+
<ProjectReference Include="..\..\Orts.Settings\Orts.Settings.csproj" />
8787
<ProjectReference Include="..\..\Orts.Simulation\Orts.Simulation.csproj" />
8888
<ProjectReference Include="..\..\RunActivity\RunActivity.csproj" />
8989
</ItemGroup>

‎Source/Launcher/Launcher.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
44
<TargetFramework Condition="'$(TargetFramework)' == ''">net20</TargetFramework>
55
<OutputType>WinExe</OutputType>
6-
<RootNamespace>ORTS</RootNamespace>
76
<AssemblyName>OpenRails</AssemblyName>
87
<ApplicationIcon>..\ORTS.ico</ApplicationIcon>
98
<UseWindowsForms>true</UseWindowsForms>

‎Source/Launcher/Program.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
using System.Text;
3434
using System.Windows.Forms;
3535

36-
namespace ORTS
36+
namespace Launcher
3737
{
3838
internal struct DependencyHint
3939
{

‎Source/Menu/ContentForm.Designer.cs‎

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)