Skip to content

Commit ea75c98

Browse files
committed
Automatic merge of T1.5.1-684-gc6e0de1c4 and 8 pull requests
- Pull request #570 at c59c788: Experimental glTF 2.0 support with PBR lighting - Pull request #839 at d00beb9: First phase of https://blueprints.launchpad.net/or/+spec/additional-cruise-control-parameters - Pull request #865 at a1318b5: Dispatcher window improvements - Pull request #874 at f8dbeab: Dynamic brake controller refactoring - Pull request #875 at 43bf33e: Bug fix for https://bugs.launchpad.net/or/+bug/2036346 Player train switching doesn't work with 3D cabs - Pull request #876 at f92de76: docs: add source for documents previously on website to source Documentation folder - Pull request #878 at 076cd04: Implement Polach Adhesion - Pull request #883 at aac4d3f: SwitchPanel disconnect/connect handling
10 parents 4ec53dc + c6e0de1 + c59c788 + d00beb9 + a1318b5 + f8dbeab + 43bf33e + f92de76 + 076cd04 + aac4d3f commit ea75c98

File tree

5 files changed

+0
-10
lines changed

5 files changed

+0
-10
lines changed

Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Copyright>Copyright © 2009 - 2022</Copyright>
1515
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1616
<DefineConstants>TRACE;WINDOWS;ACTIVITY_EDITOR</DefineConstants>
17-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1817
</PropertyGroup>
1918
<ItemGroup>
2019
<Compile Update="Wizard\ActivityDescr.cs">
@@ -87,6 +86,5 @@
8786
<PrivateAssets>all</PrivateAssets>
8887
</PackageReference>
8988
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
90-
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
9189
</ItemGroup>
9290
</Project>

Source/Contrib/ContentManager/ContentManager.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Product>Open Rails</Product>
1515
<Copyright>Copyright © 2009 - 2022</Copyright>
1616
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
17-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1817
</PropertyGroup>
1918
<ItemGroup>
2019
<Compile Update="CueTextBox.cs">
@@ -32,6 +31,5 @@
3231
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
3332
<PrivateAssets>all</PrivateAssets>
3433
</PackageReference>
35-
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
3634
</ItemGroup>
3735
</Project>

Source/Menu/Menu.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
<Product>Open Rails</Product>
1414
<Copyright>Copyright © 2009 - 2022</Copyright>
1515
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
16-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1716
</PropertyGroup>
1817
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
1918
<DocumentationFile>..\..\Program\Menu.xml</DocumentationFile>
@@ -65,6 +64,5 @@
6564
<PrivateAssets>all</PrivateAssets>
6665
</PackageReference>
6766
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
68-
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
6967
</ItemGroup>
7068
</Project>

Source/RunActivity/RunActivity.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Copyright>Copyright © 2009 - 2022</Copyright>
1515
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
1616
<DefineConstants>TRACE;WINDOWS;NEW_ACTION;WITH_NEW_SAVE;ACTIVITY_EDITOR</DefineConstants>
17-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1817
</PropertyGroup>
1918
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
2019
<DocumentationFile>..\..\Program\RunActivity.xml</DocumentationFile>
@@ -668,7 +667,6 @@
668667
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
669668
<PackageReference Include="RailDriver" Version="0.7.10" />
670669
<PackageReference Include="System.Management" Version="7.0.0" />
671-
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
672670
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
673671
<PackageReference Include="Unosquare.Swan.Lite" Version="3.1.0" />
674672
</ItemGroup>

Source/Updater/Updater.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
<Product>Open Rails</Product>
1313
<Copyright>Copyright © 2009 - 2022</Copyright>
1414
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
15-
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
1615
</PropertyGroup>
1716
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
1817
<DocumentationFile>..\..\Program\Updater.xml</DocumentationFile>
@@ -39,6 +38,5 @@
3938
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.355802">
4039
<PrivateAssets>all</PrivateAssets>
4140
</PackageReference>
42-
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
4341
</ItemGroup>
4442
</Project>

0 commit comments

Comments
 (0)