Skip to content

Commit

Permalink
Remove Mono tests
Browse files Browse the repository at this point in the history
They are a significant source of complexity and we don't
really need them as .NET Framework builds are really only
intended for loading into MSBuild in VSWin at this point.
  • Loading branch information
mhutch committed Oct 1, 2023
1 parent 04348e0 commit a9dadd2
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 19 deletions.
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net48;net6.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net48;$(TargetFrameworks)</TargetFrameworks>
<IsPackable>false</IsPackable>
<DefaultItemExcludes>$(DefaultItemExcludes);TestCases\**</DefaultItemExcludes>
</PropertyGroup>
Expand All @@ -27,14 +28,10 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
<!-- seems to be required for tests to run on Mono -->
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.7.2" Condition="'$(TargetFramework)'=='net472' And $([MSBuild]::IsOSUnixLike())" />
</ItemGroup>

<ItemGroup>
<None Include="TestCases\**\*.*" />
<!-- disable parallel test execution on github actions, it hangs the runner there -->
<None Include="..\Mono.TextTemplating.Tests\xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(GITHUB_ACTIONS)'=='true'" />
<Compile Include="..\Mono.TextTemplating.Tests\Platform.cs" />
<Compile Include="..\Mono.TextTemplating.Tests\TestDataPath.cs" />
</ItemGroup>
Expand Down
12 changes: 2 additions & 10 deletions Mono.TextTemplating.Tests/Mono.TextTemplating.Tests.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFrameworks>net472;net6.0;net7.0</TargetFrameworks>
<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('Windows'))">net472;$(TargetFrameworks)</TargetFrameworks>
<IsPackable>false</IsPackable>
<DefineConstants Condition="'$(TargetFramework)'=='net472'">$(DefineConstants);FEATURE_APPDOMAINS</DefineConstants>
<DefaultItemExcludes>$(DefaultItemExcludes);TestCases\**</DefaultItemExcludes>
Expand All @@ -10,24 +11,15 @@
<ProjectReference Include="..\Mono.TextTemplating\Mono.TextTemplating.csproj" />
<ProjectReference Include="..\Mono.TextTemplating.Roslyn\Mono.TextTemplating.Roslyn.csproj" />
</ItemGroup>
<!-- fix conflicts in indirect references
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />
-->

<ItemGroup>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
<PackageReference Include="xunit" Version="2.5.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.1" />
<!-- seems to be required for tests to run on Mono -->
<PackageReference Include="Microsoft.TestPlatform.ObjectModel" Version="17.7.2" Condition="'$(TargetFramework)'=='net472' And $([MSBuild]::IsOSUnixLike())" />
</ItemGroup>

<ItemGroup>
<None Include="TestCases\**\*.*" />
<!-- disable parallel test execution on github actions, it hangs the runner there -->
<None Update="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" Condition="'$(GITHUB_ACTIONS)'=='true'" />
</ItemGroup>

<!-- download packages that contains dlls referenced by test tt files -->
Expand Down
4 changes: 0 additions & 4 deletions Mono.TextTemplating.Tests/xunit.runner.json

This file was deleted.

0 comments on commit a9dadd2

Please sign in to comment.