Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 723dbf6

Browse files
openrails-botopenrails-bot
committed
Automatic merge of T1.5.1-162-gfd249824e and 14 pull requests
- Pull request #706 at 91bcfa2: Extended door functionality - Pull request #719 at 13a1638: Upgraded to MonoGame 3.8.0 (+ small update for other libraries) - Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor - Pull request #732 at aac9b67: Improvements for air brakes - Pull request #735 at b9a0ea3: Added new parameter for battery switch - Pull request #746 at b6acfde: Website release 1.5.1 - Pull request #748 at 4f0e878: latitude/longitude fix for bug 1393111 - Pull request #749 at db5764c: OpenRailway Map - Pull request #753 at ab8fe32: Extends CabControls for user input - Pull request #754 at 70a1325: Container weights: https://blueprints.launchpad.net/or/+spec/container-weights - Pull request #758 at 00005ce: Steam wheel slip#1 - Pull request #760 at 113dd63: Updated EditorConfig with .NET and StyleCop analyzer configuration - Pull request #761 at f6a3aca: fix: Allow 100% cloud-free skys by making 0% overcast = 0% clouds - Pull request #763 at 746bdee: build: Remove use of SolutionDir which is not supported everywhere
16 parents 93a8261 + fd24982 + 91bcfa2 + 13a1638 + fb9079e + aac9b67 + b9a0ea3 + b6acfde + 4f0e878 + db5764c + ab8fe32 + 70a1325 + 00005ce + 113dd63 + f6a3aca + 746bdee commit 723dbf6

File tree

15 files changed

+68
-1
lines changed

15 files changed

+68
-1
lines changed

‎Source/ContentChecker/ContentChecker.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
<Copyright>Copyright © 2009 - 2022</Copyright>
1313
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1414
</PropertyGroup>
15+
<ItemGroup>
16+
<Reference Include="MonoGame.Framework">
17+
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
18+
</Reference>
19+
</ItemGroup>
1520
<ItemGroup>
1621
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj" />
1722
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1616
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR</DefineConstants>
1717
</PropertyGroup>
18+
<ItemGroup>
19+
<Reference Include="MonoGame.Framework">
20+
<HintPath>..\..\..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
21+
</Reference>
22+
</ItemGroup>
1823
<ItemGroup>
1924
<Compile Update="Wizard\ActivityDescr.cs">
2025
<SubType>UserControl</SubType>

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,11 @@
1212
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1313
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR;JSON_OR_XML</DefineConstants>
1414
</PropertyGroup>
15+
<ItemGroup>
16+
<Reference Include="MonoGame.Framework">
17+
<HintPath>..\..\..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
18+
</Reference>
19+
</ItemGroup>
1520
<ItemGroup>
1621
<EmbeddedResource Include="Icon\Start.ico" />
1722
<EmbeddedResource Include="Icon\Stop.ico" />

‎Source/Contrib/DataCollector/DataCollector.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<Copyright>Copyright © 2009 - 2022</Copyright>
1414
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1515
</PropertyGroup>
16+
<ItemGroup>
17+
<Reference Include="MonoGame.Framework">
18+
<HintPath>..\..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
19+
</Reference>
20+
</ItemGroup>
1621
<ItemGroup>
1722
<ProjectReference Include="..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
1823
<ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj" />

‎Source/Contrib/TrackViewer/TrackViewer.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@
2525
<SpecificVersion>False</SpecificVersion>
2626
<HintPath>..\..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
2727
</Reference>
28+
<Reference Include="MonoGame.Framework">
29+
<HintPath>..\..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
30+
</Reference>
2831
</ItemGroup>
2932
<ItemGroup>
3033
<Content Include="Content\activeBroken.png">

‎Source/Menu/Menu.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@
3030
<SpecificVersion>False</SpecificVersion>
3131
<HintPath>..\3rdPartyLibs\GNU.Gettext.WinForms.dll</HintPath>
3232
</Reference>
33+
<Reference Include="MonoGame.Framework">
34+
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
35+
</Reference>
3336
<Reference Include="WindowsBase" />
3437
</ItemGroup>
3538
<ItemGroup>

‎Source/ORTS.Common/ORTS.Common.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
<SpecificVersion>False</SpecificVersion>
2121
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
2222
</Reference>
23+
<Reference Include="MonoGame.Framework">
24+
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
25+
</Reference>
2326
</ItemGroup>
2427
<ItemGroup>
2528
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">

‎Source/ORTS.Settings/ORTS.Settings.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@
2121
<SpecificVersion>False</SpecificVersion>
2222
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
2323
</Reference>
24+
<Reference Include="MonoGame.Framework">
25+
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
26+
</Reference>
2427
</ItemGroup>
2528
<ItemGroup>
2629
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />

‎Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,11 @@
1313
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
1414
<DocumentationFile>..\..\Program\Orts.Formats.Msts.xml</DocumentationFile>
1515
</PropertyGroup>
16+
<ItemGroup>
17+
<Reference Include="MonoGame.Framework">
18+
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
19+
</Reference>
20+
</ItemGroup>
1621
<ItemGroup>
1722
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
1823
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />

‎Source/Orts.Formats.OR/Orts.Formats.OR.csproj‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
<SpecificVersion>False</SpecificVersion>
2020
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
2121
</Reference>
22+
<Reference Include="MonoGame.Framework">
23+
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
24+
</Reference>
2225
</ItemGroup>
2326
<ItemGroup>
2427
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />

0 commit comments

Comments
 (0)