Dedup test project files and also mute style warnings in GambatteSuite

This commit is contained in:
James Groom 2024-03-08 10:33:53 +00:00 committed by GitHub
parent 8630ccdd41
commit 6df491c9d9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 16 additions and 15 deletions

View File

@ -2,12 +2,11 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<Import Project="../MainSlnCommon.props" />
<Import Project="../MainSlnTest.props" />
<PropertyGroup>
<OutputPath>$(ProjectDir)../../test_output</OutputPath>
<NoWarn>$(NoWarn);CA1310;CA1416</NoWarn>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Tests.Testroms.GB/BizHawk.Tests.Testroms.GB.csproj" />
<EmbeddedResource Include="res/**/*" />
<RuntimeHostConfigurationOption Include="System.Drawing.EnableUnixSupport" Value="true" />

View File

@ -2,10 +2,9 @@
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>
<Import Project="../MainSlnCommon.props" />
<Import Project="../MainSlnTest.props" />
<PropertyGroup>
<NoWarn>$(NoWarn);CA1310;CA1416</NoWarn>
<OutputPath>$(ProjectDir)../../test_output</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(BIZHAWKTEST_RUN_KNOWN_FAILURES)' == '' ">
<DefineConstants>$(DefineConstants);SKIP_KNOWN_FAILURES</DefineConstants>
@ -18,10 +17,6 @@
</PropertyGroup>
<!-- BIZHAWKTEST_SAVE_IMAGES=none => no extra defines -->
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
<PackageReference Include="MSTest.TestAdapter" />
<PackageReference Include="MSTest.TestFramework" />
<PackageReference Include="JunitXml.TestLogger" />
<PackageReference Include="Magick.NET-Q8-AnyCPU" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Bizware.Graphics/BizHawk.Bizware.Graphics.csproj" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />

View File

@ -5,16 +5,11 @@
<PropertyGroup Condition=" '$(APPVEYOR)' != '' ">
<TargetFramework>netcoreapp3.1</TargetFramework>
</PropertyGroup>
<Import Project="../MainSlnCommon.props" />
<Import Project="../MainSlnTest.props" />
<PropertyGroup>
<DefineConstants Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">$(DefineConstants);SKIP_PLATFORM_TESTS</DefineConstants>
<OutputPath>$(ProjectDir)../../test_output</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
<PackageReference Include="MSTest.TestAdapter" PrivateAssets="all" />
<PackageReference Include="MSTest.TestFramework" PrivateAssets="all" />
<PackageReference Include="JunitXml.TestLogger" PrivateAssets="all" />
<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
<Reference Include="NLua, Version=1.4.1.0, Culture=neutral, PublicKeyToken=null, processorArchitecture=MSIL" SpecificVersion="false" HintPath="$(ProjectDir)../../References/NLua.dll" Private="true" />
<None Include="$(ProjectDir)../../Assets/dll/lua54.dll" CopyToOutputDirectory="PreserveNewest" />

12
src/MainSlnTest.props Normal file
View File

@ -0,0 +1,12 @@
<Project>
<Import Project="MainSlnCommon.props" />
<PropertyGroup>
<OutputPath>$(ProjectDir)../../test_output</OutputPath>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" PrivateAssets="all" />
<PackageReference Include="MSTest.TestAdapter" PrivateAssets="all" />
<PackageReference Include="MSTest.TestFramework" PrivateAssets="all" />
<PackageReference Include="JunitXml.TestLogger" PrivateAssets="all" />
</ItemGroup>
</Project>