Skip to content

Commit 26985df

Browse files
Sharpe49Sharpe49
committed
Upgraded project files to .Net SDK project file format
Removed AssemblyInfo files (integrated in the project file) Removed unused files (not referenced in the old project files) Removed resource files in ActivityEditor which were causing execution problems
1 parent a6c0f04 commit 26985df

File tree

103 files changed

+508
-19260
lines changed

Some content is hidden

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

103 files changed

+508
-19260
lines changed

‎.appveyor.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: AV1.4-{build}
22
skip_branch_with_pr: true
3-
image: Visual Studio 2017
3+
image: Visual Studio 2019
44
cache:
55
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
66
- C:\ProgramData\chocolatey\lib -> .appveyor.yml

‎Build.cmd‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ IF "%Mode%" == "Stable" (
7979

8080
REM Get product version and code revision.
8181
FOR /F "usebackq tokens=1* delims==" %%A IN (`CALL GetVersion.cmd %Mode%`) DO SET %%A=%%B
82-
SET Version=%OpenRails_Version%
83-
SET Revision=%OpenRails_Revision%
8482

8583
REM Restore NuGet packages.
8684
nuget restore Source\ORTS.sln || GOTO :error
@@ -114,9 +112,9 @@ IF %ERRORLEVEL% GEQ 8 GOTO :error
114112

115113
REM Copy version number from OpenRails.exe into all other 1st party files
116114
FOR %%F IN ("Program\*.exe", "Program\Orts.*.dll", "Program\Contrib.*.dll", "Program\Tests.dll") DO (
117-
rcedit-x86.exe "%%~F" --set-product-version %Revision% --set-version-string ProductVersion %Version% || GOTO :error
115+
rcedit-x86.exe "%%~F" --set-product-version %OpenRails_Revision% --set-version-string ProductVersion %OpenRails_Version% || GOTO :error
118116
)
119-
ECHO Set product version information to "%Version%".
117+
ECHO Set product version information to "%OpenRails_Version%".
120118

121119
REM *** Special build step: signs binaries ***
122120
IF NOT "%JENKINS_TOOLS%" == "" (
@@ -133,8 +131,8 @@ IF NOT "%Mode%" == "Unstable" (
133131

134132
REM Compile the documentation.
135133
FOR %%E IN (doc docx docm xls xlsx xlsm odt) DO FOR %%F IN ("Source\Documentation\*.%%E") DO ECHO %%~F && OfficeToPDF.exe /bookmarks /print "%%~F" "Program\Documentation\%%~nF.pdf" || GOTO :error
136-
>"Source\Documentation\Manual\version.py" ECHO version = '%Version%' || GOTO :error
137-
>>"Source\Documentation\Manual\version.py" ECHO release = '%Revision%' || GOTO :error
134+
>"Source\Documentation\Manual\version.py" ECHO version = '%OpenRails_Version%' || GOTO :error
135+
>>"Source\Documentation\Manual\version.py" ECHO release = '%OpenRails_Revision%' || GOTO :error
138136
PUSHD "Source\Documentation\Manual" && CALL make.bat clean & POPD || GOTO :error
139137
PUSHD "Source\Documentation\Manual" && CALL make.bat latexpdf && POPD || GOTO :error
140138

@@ -155,7 +153,7 @@ IF "%Mode%" == "Stable" (
155153
IF %ERRORLEVEL% GEQ 8 GOTO :error
156154
ROBOCOPY /MIR /NJH /NJS "Program\Documentation" "Open Rails\Documentation"
157155
IF %ERRORLEVEL% GEQ 8 GOTO :error
158-
>"Source\Installer\Version.iss" ECHO #define MyAppVersion "%Version%" || GOTO :error
156+
>"Source\Installer\Version.iss" ECHO #define MyAppVersion "%OpenRails_Version%" || GOTO :error
159157
iscc "Source\Installer\Installer.iss" || GOTO :error
160158
CALL :move "Source\Installer\Output\OpenRailsSetup.exe" "OpenRails-%Mode%-Setup.exe" || GOTO :error
161159
REM *** Special build step: signs binaries ***

‎Source/ContentChecker/ContentChecker.csproj‎

Lines changed: 19 additions & 107 deletions
Original file line numberDiff line numberDiff line change
@@ -1,120 +1,32 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
1+
<Project Sdk="Microsoft.NET.Sdk">
42
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{316A8CAC-8BD4-4A64-A384-4A3C28C5D3D8}</ProjectGuid>
3+
<TargetFramework>net472</TargetFramework>
84
<OutputType>Exe</OutputType>
9-
<RootNamespace>ContentChecker</RootNamespace>
10-
<AssemblyName>ContentChecker</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<TargetFrameworkProfile />
15-
</PropertyGroup>
16-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
17-
<DebugSymbols>true</DebugSymbols>
18-
<OutputPath>..\..\Program\</OutputPath>
19-
<DefineConstants>DEBUG;TRACE</DefineConstants>
20-
<DebugType>full</DebugType>
21-
<PlatformTarget>AnyCPU</PlatformTarget>
22-
<ErrorReport>prompt</ErrorReport>
23-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
24-
<Prefer32Bit>false</Prefer32Bit>
25-
<LangVersion>7.3</LangVersion>
26-
</PropertyGroup>
27-
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
28-
<OutputPath>..\..\Program\</OutputPath>
29-
<DefineConstants>TRACE</DefineConstants>
30-
<Optimize>true</Optimize>
31-
<DebugType>pdbonly</DebugType>
32-
<PlatformTarget>AnyCPU</PlatformTarget>
33-
<ErrorReport>prompt</ErrorReport>
34-
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
35-
<Prefer32Bit>false</Prefer32Bit>
36-
<LangVersion>7.3</LangVersion>
37-
</PropertyGroup>
38-
<PropertyGroup>
39-
<StartupObject />
5+
<UseWindowsForms>true</UseWindowsForms>
6+
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
7+
<IsPublishable>False</IsPublishable>
8+
<Copyright>© Open Rails project</Copyright>
9+
<Authors>Open Rails project</Authors>
10+
<Description>Open Rails content checker</Description>
11+
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
4012
</PropertyGroup>
4113
<ItemGroup>
4214
<Reference Include="MonoGame.Framework">
4315
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
4416
</Reference>
45-
<Reference Include="System" />
46-
<Reference Include="System.Windows.Forms" />
47-
</ItemGroup>
48-
<ItemGroup>
49-
<Compile Include="ConsistLoader.cs" />
50-
<Compile Include="CabviewLoader.cs" />
51-
<Compile Include="CarSpawnLoader.cs" />
52-
<Compile Include="LoaderFactory.cs" />
53-
<Compile Include="NotUsedLoader.cs" />
54-
<Compile Include="SignalScriptLoader.cs" />
55-
<Compile Include="SignalConfigLoader.cs" />
56-
<Compile Include="TerrainAltitudeLoader.cs" />
57-
<Compile Include="TerrainFlagsLoader.cs" />
58-
<Compile Include="TimeTableLoader.cs" />
59-
<Compile Include="TrackTypeLoader.cs" />
60-
<Compile Include="TsectionGlobalLoader.cs" />
61-
<Compile Include="TsectionLoader.cs" />
62-
<Compile Include="WagonLoader.cs" />
63-
<Compile Include="EngineLoader.cs" />
64-
<Compile Include="TrafficLoader.cs" />
65-
<Compile Include="ServiceLoader.cs" />
66-
<Compile Include="HazardLoader.cs" />
67-
<Compile Include="NotRecognizedLoader.cs" />
68-
<Compile Include="WavLoader.cs" />
69-
<Compile Include="SmsLoader.cs" />
70-
<Compile Include="PathLoader.cs" />
71-
<Compile Include="Program.cs" />
72-
<Compile Include="Properties\AssemblyInfo.cs" />
73-
<Compile Include="RoadDataBaseLoader.cs" />
74-
<Compile Include="ShapeDescriptionLoader.cs" />
75-
<Compile Include="ActivityLoader.cs" />
76-
<Compile Include="WorldFileLoader.cs" />
77-
<Compile Include="AceLoader.cs" />
78-
<Compile Include="WorldSoundLoader.cs" />
79-
<Compile Include="ShapeLoader.cs" />
80-
<Compile Include="TrackDataBaseLoader.cs" />
81-
<Compile Include="EnvironmentFileLoader.cs" />
82-
<Compile Include="TrackFileLoader.cs" />
83-
<Compile Include="TerrainLoader.cs" />
84-
<Compile Include="Loader.cs" />
8517
</ItemGroup>
8618
<ItemGroup>
87-
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj">
88-
<Project>{812685a7-2683-4102-a3ca-2a5ced2e61ee}</Project>
89-
<Name>ORTS.Content</Name>
90-
</ProjectReference>
91-
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj">
92-
<Project>{570709fa-0c8a-4b1d-ba2d-d9455afd9b5c}</Project>
93-
<Name>Orts.Formats.Msts</Name>
94-
</ProjectReference>
95-
<ProjectReference Include="..\Orts.Formats.OR\Orts.Formats.OR.csproj">
96-
<Project>{0d8d312b-2c02-4b77-a795-566394a9db95}</Project>
97-
<Name>Orts.Formats.OR</Name>
98-
</ProjectReference>
99-
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj">
100-
<Project>{8a84696c-3559-49b8-b27f-bb6932d8a1c6}</Project>
101-
<Name>Orts.Parsers.Msts</Name>
102-
</ProjectReference>
103-
<ProjectReference Include="..\Orts.Parsers.OR\Orts.Parsers.OR.csproj">
104-
<Project>{1cc3bd5c-06c5-4784-b067-f93945a7ca2c}</Project>
105-
<Name>Orts.Parsers.OR</Name>
106-
</ProjectReference>
107-
<ProjectReference Include="..\Orts.Simulation\Orts.Simulation.csproj">
108-
<Project>{333c4378-d82e-4b47-b561-6ba923b8fdfd}</Project>
109-
<Name>Orts.Simulation</Name>
110-
</ProjectReference>
111-
<ProjectReference Include="..\RunActivity\RunActivity.csproj">
112-
<Project>{9be44f64-417d-4aa6-af4d-2a6a0cbc814d}</Project>
113-
<Name>RunActivity</Name>
114-
</ProjectReference>
19+
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj" />
20+
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
21+
<ProjectReference Include="..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
22+
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
23+
<ProjectReference Include="..\Orts.Parsers.OR\Orts.Parsers.OR.csproj" />
24+
<ProjectReference Include="..\Orts.Simulation\Orts.Simulation.csproj" />
25+
<ProjectReference Include="..\RunActivity\RunActivity.csproj" />
11526
</ItemGroup>
11627
<ItemGroup>
117-
<None Include="app.config" />
28+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
29+
<PrivateAssets>all</PrivateAssets>
30+
</PackageReference>
11831
</ItemGroup>
119-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
12032
</Project>

‎Source/ContentChecker/Properties/AssemblyInfo.cs‎

Lines changed: 0 additions & 36 deletions
This file was deleted.

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

Lines changed: 0 additions & 108 deletions
This file was deleted.

0 commit comments

Comments
 (0)