Skip to content

Commit 52e00ee

Browse files
authored
feat(TUnit): Extended netstandard2.0 (#902)
* feat(TUnit): Extended `netstandard2.0` * fix: Disabled TUnit Polyfills
1 parent 3f4b249 commit 52e00ee

File tree

7 files changed

+17
-13
lines changed

7 files changed

+17
-13
lines changed

Directory.Build.props

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,4 @@
1919
<NoWarn Condition=" '$(TargetFramework)' == 'netstandard2.0' ">$(NoWarn);CA1062;</NoWarn>
2020
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
2121
</PropertyGroup>
22-
<PropertyGroup>
23-
<!-- Workaround, until https://github.com/GitTools/GitVersion/pull/4206 is released -->
24-
<GitVersionTargetFramework>net8.0</GitVersionTargetFramework>
25-
</PropertyGroup>
2622
</Project>

Directory.Packages.props

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
<PackageVersion Include="NUnit" Version="4.4.0" />
2424
<PackageVersion Include="NUnit3TestAdapter" Version="6.0.0" />
2525
<PackageVersion Include="NUnit.Analyzers" Version="4.11.2" />
26+
<PackageVersion Include="Polyfill" Version="9.3.1" />
2627
<PackageVersion Include="PublicApiGenerator" Version="11.5.4" />
2728
<PackageVersion Include="TUnit" Version="1.5.1" />
2829
<PackageVersion Include="TUnit.Core" Version="1.5.1" />

src/NetEvolve.Extensions.TUnit/Internal/CategoryTraitBaseAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ public ValueTask OnTestDiscovered(DiscoveredTestContext context)
3030
{
3131
if (context is null)
3232
{
33-
return ValueTask.CompletedTask;
33+
return new ValueTask();
3434
}
3535

3636
context.AddCategory(Category);
3737

38-
return ValueTask.CompletedTask;
38+
return new ValueTask();
3939
}
4040
}

src/NetEvolve.Extensions.TUnit/Internal/CategoryWithIdTraitBaseAttribute.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public ValueTask OnTestDiscovered(DiscoveredTestContext context)
6363
{
6464
if (context is null)
6565
{
66-
return ValueTask.CompletedTask;
66+
return new ValueTask();
6767
}
6868

6969
context.AddCategory(Category);
7070
if (!string.IsNullOrWhiteSpace(Id))
7171
{
72-
context.AddProperty(Category, Id);
72+
context.AddProperty(Category, Id!);
7373
}
7474

75-
return ValueTask.CompletedTask;
75+
return new ValueTask();
7676
}
7777
}

src/NetEvolve.Extensions.TUnit/Internal/NamedCategoryTraitBaseAttribute.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,14 +36,14 @@ public ValueTask OnTestDiscovered(DiscoveredTestContext context)
3636
{
3737
if (context is null)
3838
{
39-
return ValueTask.CompletedTask;
39+
return new ValueTask();
4040
}
4141

4242
if (!string.IsNullOrWhiteSpace(Id))
4343
{
4444
context.AddProperty(Category, Id);
4545
}
4646

47-
return ValueTask.CompletedTask;
47+
return new ValueTask();
4848
}
4949
}
Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net8.0;net9.0;net10.0</TargetFrameworks>
3+
<TargetFrameworks>netstandard2.0;net8.0;net9.0;net10.0</TargetFrameworks>
44
<PackageTags>$(PackageTags);tunit</PackageTags>
55
<CheckEolTargetFramework>false</CheckEolTargetFramework>
6+
<EnableTUnitPolyfills>false</EnableTUnitPolyfills>
67
</PropertyGroup>
78
<ItemGroup>
89
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" />
910
<PackageReference Include="TUnit.Core" />
1011
</ItemGroup>
12+
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
13+
<PackageReference Include="Polyfill">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
16+
</PackageReference>
17+
</ItemGroup>
1118
</Project>

src/NetEvolve.Extensions.TUnit/SkipOnFailureAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ public ValueTask OnTestEnd(TestContext context)
3333
);
3434
}
3535

36-
return ValueTask.CompletedTask;
36+
return new ValueTask();
3737
}
3838
}

0 commit comments

Comments
 (0)