Skip to content

Commit

Permalink
Automatic merge of T1.4-633-g1d15fa043 and 8 pull requests
Browse files Browse the repository at this point in the history 
- Pull request #569 at 686d0ba: Upgraded project files to .Net SDK project file format
- Pull request #630 at 704731a: Sky Color Fix (Addresses Trello Roadmap Card #367 for More accurate sunrise and sunset)
- Pull request #650 at 3f8380c: Renewed Russian translation up to testing T1.4-598 version
- Pull request #652 at 918fdb1: Add button functions to Raildriver
- Pull request #669 at 1ab5f58: refactor: Separate host performance data collection and processing to another thread
- Pull request #671 at c5dcc73: Updates manual for Release 1.5
- Pull request #672 at e4ba722: Calculate distance to signal in explorer mode
- Pull request #673 at 3080e85: hu locales update
  • Loading branch information
@openrails-bot
openrails-bot committed Aug 3, 2022
10 parents 91f9a32 + 1d15fa0 + 686d0ba + 704731a + 3f8380c + 918fdb1 + 1ab5f58 + c5dcc73 + e4ba722 + 3080e85 commit ce64782
Show file tree
Hide file tree
Showing 16 changed files with 11 additions and 9,135 deletions.
Binary file removed Source/3rdPartyLibs/ICSharpCode.SharpZipLib.dll
View file
Binary file not shown.
Binary file removed Source/3rdPartyLibs/Ionic.Zip.dll
View file
Binary file not shown.
Binary file removed Source/3rdPartyLibs/Newtonsoft.Json.dll
View file
Binary file not shown.
Binary file removed Source/3rdPartyLibs/Newtonsoft.Json.pdb
View file
Binary file not shown.
9,096 changes: 0 additions & 9,096 deletions Source/3rdPartyLibs/Newtonsoft.Json.xml
View file

This file was deleted.

Binary file removed Source/3rdPartyLibs/XnaGeometry.dll
View file
Binary file not shown.
5 changes: 1 addition & 4 deletions Source/Contrib/ActivityEditor/LibAE/LibAE.csproj
View file
Expand Up @@ -14,10 +14,6 @@
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Include="Icon\Start.ico" />
Expand All @@ -40,5 +36,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
7 changes: 1 addition & 6 deletions Source/Contrib/DataConverter/DataConverter.csproj
View file
Expand Up @@ -11,12 +11,6 @@
<Description>Open Rails data converter (contributed)</Description>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<Reference Include="Newtonsoft.Json, Version=11.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
<ProjectReference Include="..\..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
Expand All @@ -26,5 +20,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
5 changes: 1 addition & 4 deletions Source/Contrib/TrackViewer/TrackViewer.csproj
View file
Expand Up @@ -26,10 +26,6 @@
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<Content Include="Content\activeBroken.png">
Expand Down Expand Up @@ -98,5 +94,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion Source/Launcher/Program.cs
View file
Expand Up @@ -117,7 +117,7 @@ static void CheckOR(List<string> missingFiles, string path)
"GNU.Gettext.dll",
"GNU.Gettext.WinForms.dll",
"ICSharpCode.SharpZipLib.dll",
"Ionic.Zip.dll",
"DotNetZip.dll",
@"Native/X86/OpenAL32.dll",
@"Native/X64/OpenAL32.dll",
// Programs:
Expand Down
10 changes: 2 additions & 8 deletions Source/ORTS.Updater/ORTS.Updater.csproj
View file
Expand Up @@ -15,23 +15,17 @@
<DocumentationFile>..\..\Program\ORTS.Updater.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="Ionic.Zip, Version=1.9.1.8, Culture=neutral, PublicKeyToken=edbe51ad942a3f5c, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\Ionic.Zip.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
<Reference Include="System.Security" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
<ProjectReference Include="..\ORTS.Settings\ORTS.Settings.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="DotNetZip" Version="1.16.0" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
5 changes: 1 addition & 4 deletions Source/Orts.Formats.OR/Orts.Formats.OR.csproj
View file
Expand Up @@ -20,10 +20,6 @@
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
Expand All @@ -36,5 +32,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
5 changes: 1 addition & 4 deletions Source/Orts.Parsers.Msts/Orts.Parsers.Msts.csproj
View file
Expand Up @@ -12,10 +12,6 @@
<DocumentationFile>..\..\Program\Orts.Parsers.Msts.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<Reference Include="ICSharpCode.SharpZipLib, Version=0.81.0.1407, Culture=neutral, PublicKeyToken=1b03e6acf1164f73">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
Expand All @@ -24,5 +20,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="SharpZipLib" Version="1.3.3" />
</ItemGroup>
</Project>
5 changes: 1 addition & 4 deletions Source/Orts.Parsers.OR/Orts.Parsers.OR.csproj
View file
Expand Up @@ -16,14 +16,11 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
5 changes: 1 addition & 4 deletions Source/Orts.Simulation/Orts.Simulation.csproj
View file
Expand Up @@ -19,10 +19,6 @@
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\3rdPartyLibs\Newtonsoft.Json.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Common\ORTS.Common.csproj" />
Expand All @@ -39,5 +35,6 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
</Project>
1 change: 1 addition & 0 deletions Source/RunActivity/RunActivity.csproj
View file
Expand Up @@ -823,6 +823,7 @@
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="RailDriver" Version="0.7.10" />
<PackageReference Include="System.Management" Version="6.0.0" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
Expand Down

0 comments on commit ce64782

Please sign in to comment.