Skip to content

Commit a3e6d0b

Browse files
committed
update test configurations
1 parent b11dd98 commit a3e6d0b

File tree

4 files changed

+38
-16
lines changed

4 files changed

+38
-16
lines changed

tests/Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,15 @@ SPDX-License-Identifier: MIT
2525
/>
2626

2727
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
28-
<PackageReference Include="NUnit" Version="3.13.3" />
29-
<PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
30-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0"/>
28+
<PackageReference Include="NUnit" Version="4.2.2" />
29+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
30+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
3131
</ItemGroup>
3232

3333
<ItemGroup>
3434
<PackageReference
3535
Include="Smdn.MSBuild.DefineConstants.NETSdkApi"
36-
Version="1.3.11"
36+
Version="[1.4.8]"
3737
PrivateAssets="all"
3838
IncludeAssets="build"
3939
/>

tests/Directory.Build.targets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@ SPDX-License-Identifier: MIT
55
<Project>
66
<Import Project="$(MSBuildThisFileDirectory)TestReleasedPackage.targets" Condition=" '$(IsTestProject)' == 'true' " />
77

8+
<ItemGroup>
9+
<PackageReference Update="Smdn.Test.NUnit.Constraints" Version="4.0.0" />
10+
<PackageReference Update="Smdn.Test.NUnit.Utils" Version="4.0.0" />
11+
</ItemGroup>
12+
813
<ImportGroup>
914
<Import Project="$(SmdnProjectAssets_TargetsImports)" />
1015
</ImportGroup>

tests/Smdn.Net.MuninNode/Smdn.Net.MuninNode.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ SPDX-License-Identifier: MIT
88
</PropertyGroup>
99

1010
<PropertyGroup>
11-
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet)' == 'true' ">net6.0</TargetFrameworks>
12-
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet)' == 'true' and $([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">net7.0;$(TargetFrameworks)</TargetFrameworks>
11+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet80)' == 'true' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
12+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet60)' == 'true' ">net6.0;$(TargetFrameworks)</TargetFrameworks>
1313
<TargetFrameworks Condition=" '$(EnableTargetFrameworkNetFx)' == 'true' ">$(TargetFrameworks)</TargetFrameworks>
1414
</PropertyGroup>
1515

tests/TargetFrameworks.props

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,27 +6,44 @@ SPDX-License-Identifier: MIT
66
<PropertyGroup>
77
<!-- enable target framework net* (.NET >= 5.0) by default -->
88
<EnableTargetFrameworkDotNet>true</EnableTargetFrameworkDotNet>
9-
<!-- enable target framework netcoreapp* by default -->
10-
<EnableTargetFrameworkNetCoreApp>true</EnableTargetFrameworkNetCoreApp>
9+
<EnableTargetFrameworkDotNet60>true</EnableTargetFrameworkDotNet60>
10+
<EnableTargetFrameworkDotNet80>true</EnableTargetFrameworkDotNet80>
1111
<!-- enable target framework net* (.NET Framework/Mono) by default -->
1212
<EnableTargetFrameworkNetFx>true</EnableTargetFrameworkNetFx>
1313
</PropertyGroup>
1414

15+
<!--
16+
Note: RuntimeInformation.RuntimeIdentifier on >= .NET 8 has been changed to return 'linux-x64' instead of 'ubuntu.20.04-x64'.
17+
RuntimeInformation.OSDescription still returns 'Ubuntu 22.04' on >= .NET 8.
18+
-->
19+
1520
<!-- On Ubuntu 22.04 -->
1621
<PropertyGroup
17-
Condition=" $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.StartsWith('ubuntu.22.04')) "
22+
Condition="
23+
$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.StartsWith('ubuntu.22.04')) or
24+
$([System.Runtime.InteropServices.RuntimeInformation]::OSDescription.StartsWith('Ubuntu 22.04'))
25+
"
1826
>
19-
<!-- disable .NET Core (cannot run .NET Core on Ubuntu 22.04) -->
20-
<EnableTargetFrameworkNetCoreApp>false</EnableTargetFrameworkNetCoreApp>
2127
<!-- disable Mono (test runner not working on local environment?) -->
22-
<EnableTargetFrameworkNetFx>false</EnableTargetFrameworkNetFx>
28+
<EnableTargetFrameworkNetFx Condition=" '$(GITHUB_ACTIONS)' != 'true' ">false</EnableTargetFrameworkNetFx>
2329
</PropertyGroup>
2430

25-
<!-- On Ubuntu 20.04 -->
31+
<!-- On Ubuntu 24.04 -->
2632
<PropertyGroup
27-
Condition=" $([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.StartsWith('ubuntu.20.04')) "
33+
Condition="
34+
$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.StartsWith('ubuntu.24.04')) or
35+
$([System.Runtime.InteropServices.RuntimeInformation]::OSDescription.StartsWith('Ubuntu 24.04'))
36+
"
2837
>
29-
<!-- enable Mono on GitHub Actions -->
30-
<EnableTargetFrameworkNetFx Condition=" '$(GITHUB_ACTIONS)' == 'true' ">true</EnableTargetFrameworkNetFx>
38+
<!-- disable net6.0 on GitHub Actions Ubuntu 24.04 runner images -->
39+
<EnableTargetFrameworkDotNet60 Condition=" '$(GITHUB_ACTIONS)' == 'true' ">false</EnableTargetFrameworkDotNet60>
40+
<!-- disable Mono on GitHub Actions Ubuntu 24.04 runner images -->
41+
<EnableTargetFrameworkNetFx Condition=" '$(GITHUB_ACTIONS)' == 'true' ">false</EnableTargetFrameworkNetFx>
42+
</PropertyGroup>
43+
44+
<!-- On MacOS -->
45+
<PropertyGroup Condition="$([System.OperatingSystem]::IsMacOS())">
46+
<!-- disable net6.0 on GitHub Actions MacOS runner images -->
47+
<EnableTargetFrameworkDotNet60 Condition=" '$(GITHUB_ACTIONS)' == 'true' ">false</EnableTargetFrameworkDotNet60>
3148
</PropertyGroup>
3249
</Project>

0 commit comments

Comments
 (0)