Skip to content

Commit daae01d

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 #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 - Pull request #884 at 8b3d60a: build: Additional settings for dotnet build
10 parents fd0d036 + c6e0de1 + c59c788 + d00beb9 + f8dbeab + 43bf33e + f92de76 + 076cd04 + aac4d3f + 8b3d60a commit daae01d

File tree

5 files changed

+10
-0
lines changed

5 files changed

+10
-0
lines changed

Source/Contrib/ActivityEditor/ActivityEditor/ActivityEditor.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
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>
1718
</PropertyGroup>
1819
<ItemGroup>
1920
<Compile Update="Wizard\ActivityDescr.cs">
@@ -86,5 +87,6 @@
8687
<PrivateAssets>all</PrivateAssets>
8788
</PackageReference>
8889
<PackageReference Include="MonoGame.Framework.WindowsDX" Version="3.8.0.1641" />
90+
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
8991
</ItemGroup>
9092
</Project>

Source/Contrib/ContentManager/ContentManager.csproj

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

Source/Menu/Menu.csproj

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

Source/RunActivity/RunActivity.csproj

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
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>
1718
</PropertyGroup>
1819
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
1920
<DocumentationFile>..\..\Program\RunActivity.xml</DocumentationFile>
@@ -667,6 +668,7 @@
667668
<PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
668669
<PackageReference Include="RailDriver" Version="0.7.10" />
669670
<PackageReference Include="System.Management" Version="7.0.0" />
671+
<PackageReference Include="System.Resources.Extensions" Version="7.0.0" />
670672
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
671673
<PackageReference Include="Unosquare.Swan.Lite" Version="3.1.0" />
672674
</ItemGroup>

Source/Updater/Updater.csproj

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

0 commit comments

Comments
 (0)