Skip to content

Commit e7c8d44

Browse files
committed
add support for .NET 10
1 parent e9256ea commit e7c8d44

File tree

9 files changed

+18
-9
lines changed

9 files changed

+18
-9
lines changed

.github/workflows/generate-release-target.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ jobs:
7070
release_target_pr_label: 'release-target'
7171
release_tag_prefix: 'releases/'
7272
workflow_runs_on: 'ubuntu-24.04'
73-
dotnet_sdk_version: '8.0.100'
73+
dotnet_sdk_version: '10.0.100'
7474
dry_run: ${{ needs.determine-release-target.outputs.dry_run == 'true' }}
7575
secrets:
7676
token_repo: ${{ secrets.PUBLISH_NEW_RELEASE }}

.github/workflows/publish-release-target.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
pr_number_request_for_release: ${{ github.event.pull_request.number }}
2424
pr_label_request_for_release: 'release-target'
2525
workflow_runs_on: 'ubuntu-24.04'
26-
dotnet_sdk_version: '8.0.100'
26+
dotnet_sdk_version: '10.0.100'
2727
secrets:
2828
token_repo: ${{ secrets.PUBLISH_NEW_RELEASE }}
2929
token_push_nuget_org: ${{ secrets.PUBLISH_PACKAGE_NUGETORG }}

src/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.Common.props

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ SPDX-License-Identifier: MIT
55
<Project>
66
<PropertyGroup>
77
<RootNamespace>Smdn.Reflection.ReverseGenerating.ListApi.Core</RootNamespace>
8-
<VersionPrefix>1.4.0</VersionPrefix>
8+
<VersionPrefix>1.5.0</VersionPrefix>
99
<VersionSuffix></VersionSuffix>
1010
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1111
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
@@ -34,9 +34,11 @@ SPDX-License-Identifier: MIT
3434
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.'))" />
3535
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" Condition="$(TargetFramework.StartsWith('net8.'))" />
3636
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="9.0.0" Condition="$(TargetFramework.StartsWith('net9.'))" />
37+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="10.0.0" Condition="$(TargetFramework.StartsWith('net10.'))" />
3738
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.'))" />
3839
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" Condition="$(TargetFramework.StartsWith('net8.'))" />
3940
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" Condition="$(TargetFramework.StartsWith('net9.'))" />
41+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" Condition="$(TargetFramework.StartsWith('net10.'))" />
4042
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
4143
</ItemGroup>
4244
</Project>

src/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks>net8.0</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<Import Project="Smdn.Reflection.ReverseGenerating.ListApi.Core.Common.props" />

src/Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks/GenerateMSBuildTargetsFile.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ SPDX-License-Identifier: MIT
3131
<!-- .NET 9.x (use files that target .NET 8) -->
3232
@(TaskFiles->WithMetadataValue('TargetFramework', 'net8.0')->'%(ImportLine)', '%0D%0A ')
3333
</ImportGroup>
34+
<ImportGroup Condition=" '%24(MSBuildRuntimeType)' == 'Core' and %24([System.Runtime.InteropServices.RuntimeInformation]::FrameworkDescription.StartsWith('.NET 10.')) ">
35+
<!-- .NET 10.x -->
36+
@(TaskFiles->WithMetadataValue('TargetFramework', 'net10.0')->'%(ImportLine)', '%0D%0A ')
37+
</ImportGroup>
3438
</Project>
3539
]]></GenerateMSBuildTargetsFileLines>
3640
</PropertyGroup>

src/Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks/Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks>net8.0</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
88
<RootNamespace>Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks</RootNamespace>
99
<VersionPrefix>1.6.0</VersionPrefix>
1010
<VersionSuffix></VersionSuffix>
@@ -52,7 +52,8 @@ SPDX-License-Identifier: MIT
5252
</PropertyGroup>
5353

5454
<ItemGroup>
55-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.43" PrivateAssets="All" />
55+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.43" PrivateAssets="All" Condition="$(TargetFramework.StartsWith('net8.'))" />
56+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" PrivateAssets="All" Condition="$(TargetFramework.StartsWith('net10.'))" />
5657
<ProjectReference Include="private\Smdn.Reflection.ReverseGenerating.ListApi.Core\Smdn.Reflection.ReverseGenerating.ListApi.Core.csproj" PrivateAssets="All" />
5758
</ItemGroup>
5859

src/Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks/private/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi.Core.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks>net8.0</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Smdn.Reflection.ReverseGenerating.ListApi.Core\Smdn.Reflection.ReverseGenerating.ListApi.Core.Common.props" />

src/Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks/private/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ SPDX-License-Identifier: MIT
44
-->
55
<Project Sdk="Microsoft.NET.Sdk">
66
<PropertyGroup>
7-
<TargetFrameworks>net8.0</TargetFrameworks>
7+
<TargetFrameworks>net10.0;net8.0</TargetFrameworks>
88
</PropertyGroup>
99

1010
<Import Project="$(MSBuildThisFileDirectory)..\..\..\Smdn.Reflection.ReverseGenerating\Smdn.Reflection.ReverseGenerating.Common.props" />

src/Smdn.Reflection.ReverseGenerating.ListApi/Smdn.Reflection.ReverseGenerating.ListApi.csproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ SPDX-License-Identifier: MIT
66
<PropertyGroup>
77
<OutputType>Exe</OutputType>
88
<PackAsTool>true</PackAsTool>
9-
<TargetFrameworks>net8.0<!-- ;net472 --></TargetFrameworks>
9+
<TargetFrameworks>net10.0;net8.0<!-- ;net472 --></TargetFrameworks>
1010
<ToolCommandName>list-api</ToolCommandName>
1111
<VersionPrefix>1.5.0</VersionPrefix>
1212
<VersionSuffix></VersionSuffix>
@@ -35,6 +35,7 @@ SPDX-License-Identifier: MIT
3535
<PackageReference Include="System.CommandLine" Version="2.0.0" />
3636
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" Condition="$(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('netcoreapp'))" />
3737
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" Condition="$(TargetFramework.StartsWith('net8.'))" />
38+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="10.0.0" Condition="$(TargetFramework.StartsWith('net10.'))" />
3839

3940
<ProjectOrPackageReference ReferencePackageVersion="[1.4.0,2.0.0)" Include="..\Smdn.Reflection.ReverseGenerating.ListApi.Core\Smdn.Reflection.ReverseGenerating.ListApi.Core.csproj" />
4041
</ItemGroup>
@@ -47,6 +48,7 @@ SPDX-License-Identifier: MIT
4748
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" Condition="$(TargetFramework.StartsWith('net6.'))" />
4849
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.'))" />
4950
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" Condition="$(TargetFramework.StartsWith('net8.'))" />
51+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" Condition="$(TargetFramework.StartsWith('net10.'))" />
5052
<PackageReference Include="Microsoft.NET.HostModel" Version="3.1.16" />
5153
<PackageReference Include="NuGet.ProjectModel" Version="6.14.0" />
5254
<PackageReference Include="Smdn.Fundamental.Shell" Version="3.0.0" />

0 commit comments

Comments
 (0)