Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgraded project files to .Net SDK project file format #569

Merged
merged 5 commits into from Aug 7, 2022
Merged

Upgraded project files to .Net SDK project file format #569

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
26985df
Upgraded project files to .Net SDK project file format
Sharpe49 Jan 6, 2022
42c6aa4
Switch Newtonsoft.Json to NuGet
Sharpe49 Jan 15, 2022
e47d5c3
Switch ICSharpCode.SharpZipLib to NuGet
Sharpe49 Jan 15, 2022
35efe98
Switch Ionic.Zip by DotNetZip (same library renamed)
Sharpe49 Jan 15, 2022
e51497d
Delete unused XnaGeometry
Sharpe49 Jan 15, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .appveyor.yml
View file
Open in desktop
@@ -1,6 +1,6 @@
version: AV1.4-{build}
skip_branch_with_pr: true
image: Visual Studio 2017
image: Visual Studio 2019
cache:
- C:\ProgramData\chocolatey\bin -> .appveyor.yml
- C:\ProgramData\chocolatey\lib -> .appveyor.yml
Expand Down
12 changes: 5 additions & 7 deletions Build.cmd
View file
Open in desktop
Expand Up @@ -79,8 +79,6 @@ IF "%Mode%" == "Stable" (

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

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

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

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

REM Compile the documentation.
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
>"Source\Documentation\Manual\version.py" ECHO version = '%Version%' || GOTO :error
>>"Source\Documentation\Manual\version.py" ECHO release = '%Revision%' || GOTO :error
>"Source\Documentation\Manual\version.py" ECHO version = '%OpenRails_Version%' || GOTO :error
>>"Source\Documentation\Manual\version.py" ECHO release = '%OpenRails_Revision%' || GOTO :error
PUSHD "Source\Documentation\Manual" && CALL make.bat clean & POPD || GOTO :error
PUSHD "Source\Documentation\Manual" && CALL make.bat latexpdf && POPD || GOTO :error

Expand All @@ -155,7 +153,7 @@ IF "%Mode%" == "Stable" (
IF %ERRORLEVEL% GEQ 8 GOTO :error
ROBOCOPY /MIR /NJH /NJS "Program\Documentation" "Open Rails\Documentation"
IF %ERRORLEVEL% GEQ 8 GOTO :error
>"Source\Installer\Version.iss" ECHO #define MyAppVersion "%Version%" || GOTO :error
>"Source\Installer\Version.iss" ECHO #define MyAppVersion "%OpenRails_Version%" || GOTO :error
iscc "Source\Installer\Installer.iss" || GOTO :error
CALL :move "Source\Installer\Output\OpenRailsSetup.exe" "OpenRails-%Mode%-Setup.exe" || GOTO :error
REM *** Special build step: signs binaries ***
Expand Down
Binary file removed Source/3rdPartyLibs/ICSharpCode.SharpZipLib.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Source/3rdPartyLibs/Ionic.Zip.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Source/3rdPartyLibs/Newtonsoft.Json.dll
View file
Open in desktop
Binary file not shown.
Binary file removed Source/3rdPartyLibs/Newtonsoft.Json.pdb
View file
Open in desktop
Binary file not shown.
9,096 changes: 0 additions & 9,096 deletions Source/3rdPartyLibs/Newtonsoft.Json.xml
View file
Open in desktop

This file was deleted.

Binary file removed Source/3rdPartyLibs/XnaGeometry.dll
View file
Open in desktop
Binary file not shown.
126 changes: 19 additions & 107 deletions Source/ContentChecker/ContentChecker.csproj
View file
Open in desktop
@@ -1,120 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{316A8CAC-8BD4-4A64-A384-4A3C28C5D3D8}</ProjectGuid>
<TargetFramework>net472</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>ContentChecker</RootNamespace>
<AssemblyName>ContentChecker</AssemblyName>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<TargetFrameworkProfile />
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>..\..\Program\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
<OutputPath>..\..\Program\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>AnyCPU</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
<LangVersion>7.3</LangVersion>
</PropertyGroup>
<PropertyGroup>
<StartupObject />
<UseWindowsForms>true</UseWindowsForms>
<ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
<IsPublishable>False</IsPublishable>
<Copyright>© Open Rails project</Copyright>
<Authors>Open Rails project</Authors>
<Description>Open Rails content checker</Description>
<PackageLicenseExpression>GPL-3.0-or-later</PackageLicenseExpression>
</PropertyGroup>
<ItemGroup>
<Reference Include="MonoGame.Framework">
<HintPath>$(SolutionDir)\3rdPartyLibs\MonoGame\MonoGame.Framework.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Windows.Forms" />
</ItemGroup>
<ItemGroup>
<Compile Include="ConsistLoader.cs" />
<Compile Include="CabviewLoader.cs" />
<Compile Include="CarSpawnLoader.cs" />
<Compile Include="LoaderFactory.cs" />
<Compile Include="NotUsedLoader.cs" />
<Compile Include="SignalScriptLoader.cs" />
<Compile Include="SignalConfigLoader.cs" />
<Compile Include="TerrainAltitudeLoader.cs" />
<Compile Include="TerrainFlagsLoader.cs" />
<Compile Include="TimeTableLoader.cs" />
<Compile Include="TrackTypeLoader.cs" />
<Compile Include="TsectionGlobalLoader.cs" />
<Compile Include="TsectionLoader.cs" />
<Compile Include="WagonLoader.cs" />
<Compile Include="EngineLoader.cs" />
<Compile Include="TrafficLoader.cs" />
<Compile Include="ServiceLoader.cs" />
<Compile Include="HazardLoader.cs" />
<Compile Include="NotRecognizedLoader.cs" />
<Compile Include="WavLoader.cs" />
<Compile Include="SmsLoader.cs" />
<Compile Include="PathLoader.cs" />
<Compile Include="Program.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="RoadDataBaseLoader.cs" />
<Compile Include="ShapeDescriptionLoader.cs" />
<Compile Include="ActivityLoader.cs" />
<Compile Include="WorldFileLoader.cs" />
<Compile Include="AceLoader.cs" />
<Compile Include="WorldSoundLoader.cs" />
<Compile Include="ShapeLoader.cs" />
<Compile Include="TrackDataBaseLoader.cs" />
<Compile Include="EnvironmentFileLoader.cs" />
<Compile Include="TrackFileLoader.cs" />
<Compile Include="TerrainLoader.cs" />
<Compile Include="Loader.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj">
<Project>{812685a7-2683-4102-a3ca-2a5ced2e61ee}</Project>
<Name>ORTS.Content</Name>
</ProjectReference>
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj">
<Project>{570709fa-0c8a-4b1d-ba2d-d9455afd9b5c}</Project>
<Name>Orts.Formats.Msts</Name>
</ProjectReference>
<ProjectReference Include="..\Orts.Formats.OR\Orts.Formats.OR.csproj">
<Project>{0d8d312b-2c02-4b77-a795-566394a9db95}</Project>
<Name>Orts.Formats.OR</Name>
</ProjectReference>
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj">
<Project>{8a84696c-3559-49b8-b27f-bb6932d8a1c6}</Project>
<Name>Orts.Parsers.Msts</Name>
</ProjectReference>
<ProjectReference Include="..\Orts.Parsers.OR\Orts.Parsers.OR.csproj">
<Project>{1cc3bd5c-06c5-4784-b067-f93945a7ca2c}</Project>
<Name>Orts.Parsers.OR</Name>
</ProjectReference>
<ProjectReference Include="..\Orts.Simulation\Orts.Simulation.csproj">
<Project>{333c4378-d82e-4b47-b561-6ba923b8fdfd}</Project>
<Name>Orts.Simulation</Name>
</ProjectReference>
<ProjectReference Include="..\RunActivity\RunActivity.csproj">
<Project>{9be44f64-417d-4aa6-af4d-2a6a0cbc814d}</Project>
<Name>RunActivity</Name>
</ProjectReference>
<ProjectReference Include="..\ORTS.Content\ORTS.Content.csproj" />
<ProjectReference Include="..\Orts.Formats.Msts\Orts.Formats.Msts.csproj" />
<ProjectReference Include="..\Orts.Formats.OR\Orts.Formats.OR.csproj" />
<ProjectReference Include="..\Orts.Parsers.Msts\Orts.Parsers.Msts.csproj" />
<ProjectReference Include="..\Orts.Parsers.OR\Orts.Parsers.OR.csproj" />
<ProjectReference Include="..\Orts.Simulation\Orts.Simulation.csproj" />
<ProjectReference Include="..\RunActivity\RunActivity.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.336902">
<PrivateAssets>all</PrivateAssets>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>
36 changes: 0 additions & 36 deletions Source/ContentChecker/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

108 changes: 0 additions & 108 deletions Source/Contrib/ActivityEditor/AEWizard/AEWizard.csproj
View file
Open in desktop

This file was deleted.