Skip to content

Commit 7ee4c80

Browse files
smdnsmdn
committed
update test configurations
1 parent 506f25d commit 7ee4c80

File tree

9 files changed

+37
-13
lines changed

9 files changed

+37
-13
lines changed

‎.github/workflows/test-packages.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
os: ${{ steps.input-prerequisites.outputs.os }}
4848
verbose: ${{ steps.input-prerequisites.outputs.verbose }}
4949
env:
50-
RUNS_ON_OS_LIST_DEFAULT: 'ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest'
50+
RUNS_ON_OS_LIST_DEFAULT: 'ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest'
5151
steps:
5252
- name: Delay until the package is published
5353
run: |
@@ -73,7 +73,7 @@ jobs:
7373
fi
7474
7575
run-test:
76-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.3.1
76+
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.3.2
7777
needs: prerequisites
7878
with:
7979
project: ${{ github.event.inputs.project }}

‎.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ jobs:
6565
os: ${{ steps.input-prerequisites.outputs.os }}
6666
verbose: ${{ steps.input-prerequisites.outputs.verbose }}
6767
env:
68-
RUNS_ON_OS_LIST_DEFAULT: 'ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest'
68+
RUNS_ON_OS_LIST_DEFAULT: 'ubuntu-24.04, ubuntu-22.04, ubuntu-20.04, windows-latest, macos-latest'
6969
steps:
7070
- name: Determine prerequisites
7171
id: input-prerequisites
@@ -83,7 +83,7 @@ jobs:
8383
fi
8484
8585
run-test:
86-
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.3.1
86+
uses: smdn/Smdn.Fundamentals/.github/workflows/test.yml@workflows/test-v1.3.2
8787
needs: prerequisites
8888
with:
8989
project: ${{ github.event.inputs.project }}

‎src/Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ SPDX-License-Identifier: MIT
1919
<ItemGroup>
2020
<PackageReference
2121
Include="Smdn.MSBuild.DefineConstants.NETSdkApi"
22-
Version="[1.4.0]"
22+
Version="[1.4.6]"
2323
PrivateAssets="all"
2424
IncludeAssets="build"
2525
/>

‎src/ProjectAssets.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SPDX-License-Identifier: MIT
55
<Project>
66
<PropertyGroup>
77
<SmdnProjectAssets_Common_PackageVersion Condition=" '$(SmdnProjectAssets_Common_PackageVersion)' == '' ">1.4.0</SmdnProjectAssets_Common_PackageVersion>
8-
<SmdnProjectAssets_Library_PackageVersion Condition=" '$(SmdnProjectAssets_Library_PackageVersion)' == '' ">1.7.1</SmdnProjectAssets_Library_PackageVersion>
8+
<SmdnProjectAssets_Library_PackageVersion Condition=" '$(SmdnProjectAssets_Library_PackageVersion)' == '' ">1.7.3</SmdnProjectAssets_Library_PackageVersion>
99
</PropertyGroup>
1010

1111
<!--

‎tests/Directory.Build.props

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ SPDX-License-Identifier: MIT
2626
/>
2727

2828
<ItemGroup Condition=" '$(IsTestProject)' == 'true' ">
29-
<PackageReference Include="NUnit" Version="4.1.0" />
30-
<PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
31-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0"/>
29+
<PackageReference Include="NUnit" Version="4.2.2" />
30+
<PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
31+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1"/>
3232
<PackageReference
3333
Include="Smdn.MSBuild.DefineConstants.NETSdkApi"
34-
Version="[1.4.0]"
34+
Version="[1.4.6]"
3535
PrivateAssets="all"
3636
IncludeAssets="build"
3737
/>

‎tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet)' == 'true' ">net8.0;net6.0</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet80)' == 'true' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
8+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet60)' == 'true' ">net6.0;$(TargetFrameworks)</TargetFrameworks>
89
<TargetFrameworks Condition=" '$(EnableTargetFrameworkNetFx)' == 'true' ">$(TargetFrameworks)</TargetFrameworks>
910
<RootNamespace>Smdn.Reflection.ReverseGenerating.ListApi.Core</RootNamespace>
1011
<NoWarn>CS2002;$(NoWarn)</NoWarn>

‎tests/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet)' == 'true' ">net8.0;net6.0</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet80)' == 'true' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
8+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet60)' == 'true' ">net6.0;$(TargetFrameworks)</TargetFrameworks>
89
<TargetFrameworks Condition=" '$(EnableTargetFrameworkNetFx)' == 'true' ">$(TargetFrameworks)<!-- ;net472 --></TargetFrameworks>
910
<RootNamespace>Smdn.Reflection.ReverseGenerating.ListApi</RootNamespace>
1011
<NoWarn>CS2002;$(NoWarn)</NoWarn>

‎tests/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet)' == 'true' ">net8.0;net6.0</TargetFrameworks>
7+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet80)' == 'true' ">net8.0;$(TargetFrameworks)</TargetFrameworks>
8+
<TargetFrameworks Condition=" '$(EnableTargetFrameworkDotNet60)' == 'true' ">net6.0;$(TargetFrameworks)</TargetFrameworks>
89
<TargetFrameworks Condition=" '$(EnableTargetFrameworkNetFx)' == 'true' ">$(TargetFrameworks);net47</TargetFrameworks>
910
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1011
<!-- do not use 'enable' or 'annotations': affects the behavior of the test cases -->

‎tests/TargetFrameworks.props

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ SPDX-License-Identifier: MIT
66
<PropertyGroup>
77
<!-- enable target framework net* (.NET >= 5.0) by default -->
88
<EnableTargetFrameworkDotNet>true</EnableTargetFrameworkDotNet>
9+
<EnableTargetFrameworkDotNet60>true</EnableTargetFrameworkDotNet60>
10+
<EnableTargetFrameworkDotNet80>true</EnableTargetFrameworkDotNet80>
911
<!-- enable target framework net* (.NET Framework/Mono) by default -->
1012
<EnableTargetFrameworkNetFx>true</EnableTargetFrameworkNetFx>
1113
</PropertyGroup>
@@ -25,4 +27,23 @@ SPDX-License-Identifier: MIT
2527
<!-- disable Mono (test runner not working on local environment?) -->
2628
<EnableTargetFrameworkNetFx Condition=" '$(GITHUB_ACTIONS)' != 'true' ">false</EnableTargetFrameworkNetFx>
2729
</PropertyGroup>
30+
31+
<!-- On Ubuntu 24.04 -->
32+
<PropertyGroup
33+
Condition="
34+
$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier.StartsWith('ubuntu.24.04')) or
35+
$([System.Runtime.InteropServices.RuntimeInformation]::OSDescription.StartsWith('Ubuntu 24.04'))
36+
"
37+
>
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>
48+
</PropertyGroup>
2849
</Project>

0 commit comments

Comments
 (0)