Skip to content

Commit

Permalink
Automatic merge of T1.5.1-174-gd2e682132 and 12 pull requests
Browse files Browse the repository at this point in the history 
- Pull request #706 at 91bcfa2: Extended door functionality
- Pull request #722 at fb9079e: Fix Windows Forms deprecations in ActivityEditor
- Pull request #732 at 8abe61f: Improvements for air brakes
- Pull request #735 at b9a0ea3: Added new parameter for battery switch
- Pull request #746 at f5566d7: Website release 1.5.1
- 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 a9e9512: 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 #764 at 5f9a01b: fix: Improve sky dome distortion causing bug #1471416
- Pull request #765 at 083467b: Bug fix for https://bugs.launchpad.net/or/+bug/2002183 OK to proceed sound played wrongly
  • Loading branch information
@openrails-bot
openrails-bot committed Jan 12, 2023
14 parents 6702583 + d2e6821 + 91bcfa2 + fb9079e + 8abe61f + b9a0ea3 + f5566d7 + ab8fe32 + 70a1325 + a9e9512 + 113dd63 + f6a3aca + 5f9a01b + 083467b commit f4ac901
Show file tree
Hide file tree
Showing 38 changed files with 25,509 additions and 78 deletions.
12 changes: 0 additions & 12 deletions .config/dotnet-tools.json
View file

This file was deleted.

Binary file added Source/3rdPartyLibs/MonoGame/CppNet.dll
View file
Binary file not shown.
Binary file added Source/3rdPartyLibs/MonoGame/MonoGame.Framework.Content.Pipeline.dll
View file
Binary file not shown.
7,294 changes: 7,294 additions & 0 deletions Source/3rdPartyLibs/MonoGame/MonoGame.Framework.Content.Pipeline.xml
View file

Large diffs are not rendered by default.

Binary file added Source/3rdPartyLibs/MonoGame/MonoGame.Framework.dll
View file
Binary file not shown.
18,061 changes: 18,061 additions & 0 deletions Source/3rdPartyLibs/MonoGame/MonoGame.Framework.xml
View file

Large diffs are not rendered by default.

Binary file added Source/3rdPartyLibs/MonoGame/SharpDX.D3DCompiler.dll
View file
Binary file not shown.
Binary file added Source/3rdPartyLibs/MonoGame/SharpDX.DXGI.dll
View file
Binary file not shown.
Binary file added Source/3rdPartyLibs/MonoGame/SharpDX.Direct3D11.dll
View file
Binary file not shown.
Binary file added Source/3rdPartyLibs/MonoGame/SharpDX.XAudio2.dll
View file
Binary file not shown.
Binary file added Source/3rdPartyLibs/MonoGame/SharpDX.dll
View file
Binary file not shown.
8 changes: 6 additions & 2 deletions Source/ContentChecker/ContentChecker.csproj
View file
Expand Up @@ -12,6 +12,11 @@
<Copyright>Copyright © 2009 - 2022</Copyright>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj" />
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
Expand All @@ -22,9 +27,8 @@
<ProjectReference Include="..\RunActivity\RunActivity.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
</ItemGroup>
</Project>
8 changes: 6 additions & 2 deletions Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj
View file
Expand Up @@ -15,6 +15,11 @@
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Compile Update="Wizard\ActivityDescr.cs">
<SubType>UserControl</SubType>
Expand Down Expand Up @@ -82,9 +87,8 @@
<ProjectReference Include="..\LibAE\LibAE.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
</ItemGroup>
</Project>
8 changes: 6 additions & 2 deletions Source/Contrib/ActivityEditor/LibAE/LibAE.csproj
View file
Expand Up @@ -12,6 +12,11 @@
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR;JSON_OR_XML</DefineConstants>
</PropertyGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Icon\Start.ico" />
<EmbeddedResource Include="Icon\Stop.ico" />
Expand All @@ -30,10 +35,9 @@
<ProjectReference Include="..\..\..\ORTS.Settings\ORTS.Settings.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/Contrib/ContentManager/ContentManager.csproj
View file
Expand Up @@ -28,7 +28,7 @@
<ProjectReference Include="..\..\ORTS.Settings\ORTS.Settings.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
8 changes: 6 additions & 2 deletions Source/Contrib/DataCollector/DataCollector.csproj
View file
Expand Up @@ -13,14 +13,18 @@
<Copyright>Copyright © 2009 - 2022</Copyright>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
<ProjectReference Include="..\..\ORTS.Common\ORTS.Common.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/Contrib/DataConverter/DataConverter.csproj
View file
Expand Up @@ -19,7 +19,7 @@
<ProjectReference Include="..\..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
2 changes: 1 addition & 1 deletion Source/Contrib/DataValidator/DataValidator.csproj
View file
Expand Up @@ -18,7 +18,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/Contrib/SimulatorTester/SimulatorTester.csproj
View file
Expand Up @@ -23,7 +23,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
Expand Down
12 changes: 7 additions & 5 deletions Source/Contrib/TrackViewer/TrackViewer.csproj
View file
Expand Up @@ -25,6 +25,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Content\activeBroken.png">
Expand Down Expand Up @@ -87,13 +90,12 @@
<ProjectReference Include="..\..\RunActivity\RunActivity.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="System.ServiceModel.Duplex" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.9.0" />
<PackageReference Include="System.ServiceModel.Federation" Version="4.9.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="System.ServiceModel.Duplex" Version="4.10.0" />
<PackageReference Include="System.ServiceModel.NetTcp" Version="4.10.0" />
<PackageReference Include="System.ServiceModel.Federation" Version="4.10.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/Launcher/Launcher.csproj
View file
Expand Up @@ -26,7 +26,7 @@
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions Source/Menu/Menu.csproj
View file
Expand Up @@ -30,6 +30,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\GNU.Gettext.WinForms.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="WindowsBase" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -59,9 +62,8 @@
</ItemGroup>
<PropertyGroup />
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions Source/ORTS.Common/ORTS.Common.csproj
View file
Expand Up @@ -20,12 +20,14 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="System.Management" Version="6.0.0" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/ORTS.Content/ORTS.Content.csproj
View file
Expand Up @@ -14,7 +14,7 @@
<DocumentationFile>..\..\Program\ORTS.Content.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/ORTS.IO/ORTS.IO.csproj
View file
Expand Up @@ -14,7 +14,7 @@
<DocumentationFile>..\..\Program\ORTS.IO.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Source/ORTS.Menu/ORTS.Menu.csproj
View file
Expand Up @@ -27,7 +27,7 @@
<ProjectReference Include="..\ORTS.Settings\ORTS.Settings.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
Expand Down
6 changes: 4 additions & 2 deletions Source/ORTS.Settings/ORTS.Settings.csproj
View file
Expand Up @@ -21,14 +21,16 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/ORTS.Updater/ORTS.Updater.csproj
View file
Expand Up @@ -25,7 +25,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
Expand Down
8 changes: 6 additions & 2 deletions Source/Orts.Formats.Msts/Orts.Formats.Msts.csproj
View file
Expand Up @@ -13,15 +13,19 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<DocumentationFile>..\..\Program\Orts.Formats.Msts.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
<ProjectReference Include="..\ORTS.IO\ORTS.IO.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
</ItemGroup>
</Project>
6 changes: 4 additions & 2 deletions Source/Orts.Formats.OR/Orts.Formats.OR.csproj
View file
Expand Up @@ -19,6 +19,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
Expand All @@ -28,10 +31,9 @@
<ProjectReference Include="..\Orts.Parsers.OR\Orts.Parsers.OR.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
10 changes: 7 additions & 3 deletions Source/Orts.Parsers.Msts/Orts.Parsers.Msts.csproj
View file
Expand Up @@ -14,10 +14,14 @@
<DocumentationFile>..\..\Program\Orts.Parsers.Msts.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="SharpZipLib" Version="1.4.0" />
<PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup>
</Project>
9 changes: 7 additions & 2 deletions Source/Orts.Parsers.OR/Orts.Parsers.OR.csproj
View file
Expand Up @@ -14,10 +14,15 @@
<DocumentationFile>..\..\Program\Orts.Parsers.OR.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<Reference Include="MonoGame.Framework, Version=3.7.1.189, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
10 changes: 6 additions & 4 deletions Source/Orts.Simulation/Orts.Simulation.csproj
View file
Expand Up @@ -18,6 +18,9 @@
<Reference Include="GNU.Gettext">
<HintPath>..\3rdPartyLibs\GNU.Gettext.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
Expand All @@ -29,12 +32,11 @@
<ProjectReference Include="..\ORTS.Settings\ORTS.Settings.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.3.1" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.346202">
<PackageReference Include="Microsoft.CodeAnalysis" Version="4.2.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.2.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>

0 comments on commit f4ac901

Please sign in to comment.