Skip to content

Commit e715fa4

Browse files
SteelFillSteelFill
authored
Merge branch 'openrails:master' into multi_track_profiles
2 parents 4216d70 + 092fac2 commit e715fa4

File tree

137 files changed

+6978
-241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+6978
-241
lines changed

‎Source/ContentChecker/ContentChecker.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<UseWindowsForms>true</UseWindowsForms>
77
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<AssemblyName>Contrib.ActivityEditor</AssemblyName>
77
<ApplicationIcon>..\..\..\ORTS.ico</ApplicationIcon>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Library</OutputType>
66
<AssemblyName>Contrib.LibAE</AssemblyName>
77
<IsPublishable>False</IsPublishable>

‎Source/Contrib/ContentManager/ContentManager.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<RootNamespace>ORTS.ContentManager</RootNamespace>
77
<AssemblyName>Contrib.ContentManager</AssemblyName>

‎Source/Contrib/DataCollector/DataCollector.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>ORTS.DataCollector</RootNamespace>
77
<AssemblyName>Contrib.DataCollector</AssemblyName>

‎Source/Contrib/DataConverter/DataConverter.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>Orts.DataConverter</RootNamespace>
77
<AssemblyName>Contrib.DataConverter</AssemblyName>

‎Source/Contrib/DataValidator/DataValidator.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<AssemblyName>Contrib.DataValidator</AssemblyName>
77
<IsPublishable>False</IsPublishable>

‎Source/Contrib/SimulatorTester/SimulatorTester.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>Exe</OutputType>
66
<RootNamespace>Orts.SimulatorTester</RootNamespace>
77
<AssemblyName>Contrib.SimulatorTester</AssemblyName>

‎Source/Contrib/TrackViewer/TrackViewer.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFrameworks>
4-
<TargetFrameworks Condition="'$(TargetFrameworks)' == ''">net472</TargetFrameworks>
3+
<TargetFramework Condition="'$(BuildDotNet)' == 'true'">net6-windows</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFramework)' == ''">net472</TargetFramework>
55
<OutputType>WinExe</OutputType>
66
<RootNamespace>ORTS.TrackViewer</RootNamespace>
77
<AssemblyName>Contrib.TrackViewer</AssemblyName>

‎Source/Documentation/Manual/_static/readme.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
this empty directory supresses a warning during sphinx build

0 commit comments

Comments
 (0)