Skip to content

Commit b848c88

Browse files
jsm174freezy
jsm174
authored and
freezy
committed
misc: modernize test project
1 parent c9abd91 commit b848c88

File tree

6 files changed

+44
-124
lines changed

6 files changed

+44
-124
lines changed

‎VisualPinball.Engine.Mpf.Test/App.config‎

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

‎VisualPinball.Engine.Mpf.Test/Program.cs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
// Visual Pinball Engine
2-
// Copyright (C) 2021 freezy and VPE Team
3-
//
4-
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5-
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6-
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
7-
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
8-
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
9-
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
10-
// SOFTWARE.
11-
1+
// Visual Pinball Engine
2+
// Copyright (C) 2021 freezy and VPE Team
3+
//
4+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
5+
// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
6+
// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
7+
// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
8+
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
9+
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
10+
// SOFTWARE.
11+
1212
using System;
1313
using System.Collections.Generic;
1414
using System.Diagnostics;

‎VisualPinball.Engine.Mpf.Test/Properties/AssemblyInfo.cs‎

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

‎VisualPinball.Engine.Mpf.Test/VisualPinball.Engine.Mpf.Test.csproj‎

Lines changed: 15 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -1,59 +1,21 @@
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">
2+
43
<PropertyGroup>
5-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7-
<ProjectGuid>{4C2E8223-2378-4926-90F3-5774809E43B7}</ProjectGuid>
84
<OutputType>Exe</OutputType>
9-
<RootNamespace>MpfTest</RootNamespace>
10-
<AssemblyName>MpfTest</AssemblyName>
11-
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
14-
<Deterministic>true</Deterministic>
5+
<TargetFramework>netcoreapp3.1</TargetFramework>
6+
<LangVersion>7.3</LangVersion>
7+
<AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
158
</PropertyGroup>
16-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
17-
<PlatformTarget>AnyCPU</PlatformTarget>
18-
<DebugSymbols>true</DebugSymbols>
19-
<DebugType>full</DebugType>
20-
<Optimize>false</Optimize>
21-
<OutputPath>bin\Debug\</OutputPath>
22-
<DefineConstants>DEBUG;TRACE</DefineConstants>
23-
<ErrorReport>prompt</ErrorReport>
24-
<WarningLevel>4</WarningLevel>
9+
10+
<PropertyGroup Condition="'$(RuntimeIdentifier)' == ''">
11+
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' != 'x86'">win-x64</RuntimeIdentifier>
12+
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Windows')) And '$(PlatformTarget)' == 'x86'">win-x86</RuntimeIdentifier>
13+
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('OSX'))">osx-x64</RuntimeIdentifier>
14+
<RuntimeIdentifier Condition="$([MSBuild]::IsOSPlatform('Linux'))">linux-x64</RuntimeIdentifier>
2515
</PropertyGroup>
26-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
27-
<PlatformTarget>AnyCPU</PlatformTarget>
28-
<DebugType>pdbonly</DebugType>
29-
<Optimize>true</Optimize>
30-
<OutputPath>bin\Release\</OutputPath>
31-
<DefineConstants>TRACE</DefineConstants>
32-
<ErrorReport>prompt</ErrorReport>
33-
<WarningLevel>4</WarningLevel>
34-
</PropertyGroup>
35-
<ItemGroup>
36-
<Reference Include="System" />
37-
<Reference Include="System.Core" />
38-
<Reference Include="System.Xml.Linq" />
39-
<Reference Include="System.Data.DataSetExtensions" />
40-
<Reference Include="Microsoft.CSharp" />
41-
<Reference Include="System.Data" />
42-
<Reference Include="System.Net.Http" />
43-
<Reference Include="System.Xml" />
44-
</ItemGroup>
45-
<ItemGroup>
46-
<Compile Include="Program.cs" />
47-
<Compile Include="Properties\AssemblyInfo.cs" />
48-
</ItemGroup>
49-
<ItemGroup>
50-
<None Include="App.config" />
51-
</ItemGroup>
16+
5217
<ItemGroup>
53-
<ProjectReference Include="..\VisualPinball.Engine.Mpf\VisualPinball.Engine.Mpf.csproj">
54-
<Project>{4886c204-99c9-40ab-a71f-043af931cbf7}</Project>
55-
<Name>VisualPinball.Engine.Mpf</Name>
56-
</ProjectReference>
18+
<ProjectReference Include="..\VisualPinball.Engine.Mpf\VisualPinball.Engine.Mpf.csproj" />
5719
</ItemGroup>
58-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
59-
</Project>
20+
21+
</Project>

‎VisualPinball.Engine.Mpf.sln‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
44
VisualStudioVersion = 16.0.29905.134
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualPinball.Engine.Mpf", "VisualPinball.Engine.Mpf\VisualPinball.Engine.Mpf.csproj", "{4886C204-99C9-40AB-A71F-043AF931CBF7}"
6+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{E82C4823-9478-4CD8-981F-77B3D7B42E98}"
7+
ProjectSection(SolutionItems) = preProject
8+
README.md = README.md
9+
.gitignore = .gitignore
10+
EndProjectSection
711
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualPinball.Engine.Mpf.Test", "VisualPinball.Engine.Mpf.Test\VisualPinball.Engine.Mpf.Test.csproj", "{4C2E8223-2378-4926-90F3-5774809E43B7}"
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualPinball.Engine.Mpf", "VisualPinball.Engine.Mpf\VisualPinball.Engine.Mpf.csproj", "{E02DAB00-9AC1-4134-AA9D-E30B4635E830}"
913
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution", "Solution", "{E82C4823-9478-4CD8-981F-77B3D7B42E98}"
11-
ProjectSection(SolutionItems) = preProject
12-
README.md = README.md
13-
.gitignore = .gitignore
14-
EndProjectSection
14+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualPinball.Engine.Mpf.Test", "VisualPinball.Engine.Mpf.Test\VisualPinball.Engine.Mpf.Test.csproj", "{9B430BFA-80CD-4595-BE99-E93324D39FE7}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Any CPU = Debug|Any CPU
1919
Release|Any CPU = Release|Any CPU
2020
EndGlobalSection
2121
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{4886C204-99C9-40AB-A71F-043AF931CBF7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{4886C204-99C9-40AB-A71F-043AF931CBF7}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{4886C204-99C9-40AB-A71F-043AF931CBF7}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{4886C204-99C9-40AB-A71F-043AF931CBF7}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{4C2E8223-2378-4926-90F3-5774809E43B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{4C2E8223-2378-4926-90F3-5774809E43B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{4C2E8223-2378-4926-90F3-5774809E43B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{4C2E8223-2378-4926-90F3-5774809E43B7}.Release|Any CPU.Build.0 = Release|Any CPU
22+
{E02DAB00-9AC1-4134-AA9D-E30B4635E830}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23+
{E02DAB00-9AC1-4134-AA9D-E30B4635E830}.Debug|Any CPU.Build.0 = Debug|Any CPU
24+
{E02DAB00-9AC1-4134-AA9D-E30B4635E830}.Release|Any CPU.ActiveCfg = Release|Any CPU
25+
{E02DAB00-9AC1-4134-AA9D-E30B4635E830}.Release|Any CPU.Build.0 = Release|Any CPU
26+
{9B430BFA-80CD-4595-BE99-E93324D39FE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27+
{9B430BFA-80CD-4595-BE99-E93324D39FE7}.Debug|Any CPU.Build.0 = Debug|Any CPU
28+
{9B430BFA-80CD-4595-BE99-E93324D39FE7}.Release|Any CPU.ActiveCfg = Release|Any CPU
29+
{9B430BFA-80CD-4595-BE99-E93324D39FE7}.Release|Any CPU.Build.0 = Release|Any CPU
3030
EndGlobalSection
3131
GlobalSection(SolutionProperties) = preSolution
3232
HideSolutionNode = FALSE

‎VisualPinball.Engine.Mpf/VisualPinball.Engine.Mpf.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,12 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Grpc.Tools" Version="2.36.0">
19+
<PackageReference Include="Grpc.Tools" Version="2.36.1">
2020
<PrivateAssets>all</PrivateAssets>
2121
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
2222
</PackageReference>
23-
<PackageReference Include="Grpc" Version="2.36.0" />
24-
<PackageReference Include="Google.Protobuf" Version="3.15.3" />
23+
<PackageReference Include="Grpc" Version="2.36.1" />
24+
<PackageReference Include="Google.Protobuf" Version="3.15.5" />
2525
</ItemGroup>
2626

2727
<ItemGroup>

0 commit comments

Comments
 (0)