Skip to content

Commit a4e157b

Browse files
smdnsmdn
committed
migrate .NET 7.0 to .NET 8.0
1 parent da04ca3 commit a4e157b

File tree

13 files changed

+42
-38
lines changed

13 files changed

+42
-38
lines changed

‎src/Sdk.net7.0.props‎ renamed to ‎src/Sdk.net8.0.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ SPDX-FileCopyrightText: 2022 smdn <smdn@smdn.jp>
33
SPDX-License-Identifier: MIT
44
-->
55
<Project>
6-
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '7.0.0'))">
7-
<TargetFrameworks>net7.0;$(TargetFrameworks)</TargetFrameworks>
6+
<PropertyGroup Condition="$([MSBuild]::VersionGreaterThanOrEquals('$(NETCoreSdkVersion)', '8.0.0'))">
7+
<TargetFrameworks>net8.0;$(TargetFrameworks)</TargetFrameworks>
88
</PropertyGroup>
99
</Project>

‎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
@@ -16,7 +16,7 @@ SPDX-License-Identifier: MIT
1616
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
1717
</PropertyGroup>
1818

19-
<Import Project="$(MSBuildThisFileDirectory)..\Sdk.net7.0.props" />
19+
<Import Project="$(MSBuildThisFileDirectory)..\Sdk.net8.0.props" />
2020

2121
<PropertyGroup Label="assembly attributes">
2222
<Description>A common library for the tools of reverse generating API lists.</Description>
@@ -35,8 +35,10 @@ SPDX-License-Identifier: MIT
3535
<ItemGroup>
3636
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="6.0.0" Condition="$(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('netcoreapp'))" />
3737
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.'))" />
38+
<PackageReference Include="System.Reflection.MetadataLoadContext" Version="8.0.0" Condition="$(TargetFramework.StartsWith('net8.'))" />
3839
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" Condition="$(TargetFramework.StartsWith('net6.')) Or $(TargetFramework.StartsWith('netcoreapp'))" />
3940
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" Condition="$(TargetFramework.StartsWith('net7.'))" />
41+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" Condition="$(TargetFramework.StartsWith('net8.'))" />
4042
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
4143
</ItemGroup>
4244
</Project>

‎src/Smdn.Reflection.ReverseGenerating.ListApi.MSBuild.Tasks/UsingExportedTasks.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ SPDX-License-Identifier: MIT
77
<PropertyGroup>
88
<UseExportedTasksFromOutputAssembly>true</UseExportedTasksFromOutputAssembly>
99
<UsingTaskAssemblyFileConfiguration>Release</UsingTaskAssemblyFileConfiguration>
10-
<UsingTaskAssemblyFileTargetFramework>net6.0</UsingTaskAssemblyFileTargetFramework>
10+
<UsingTaskAssemblyFileTargetFramework>net8.0</UsingTaskAssemblyFileTargetFramework>
1111
</PropertyGroup>
1212

1313
<UsingTask

‎src/Smdn.Reflection.ReverseGenerating/Smdn.Reflection.ReverseGenerating.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ SPDX-License-Identifier: MIT
1717
<EnableTrimAnalyzer>false</EnableTrimAnalyzer>
1818
</PropertyGroup>
1919

20-
<Import Project="..\Sdk.net7.0.props" />
20+
<Import Project="..\Sdk.net8.0.props" />
2121

2222
<PropertyGroup>
2323
<DefineConstants Condition="
@@ -29,7 +29,8 @@ SPDX-License-Identifier: MIT
2929
">$(DefineConstants);CAN_OVERRIDE_CUSTOMATTRIBUTEDATA_ATTRIBUTETYPE</DefineConstants>
3030
<DefineConstants Condition="
3131
$(TargetFramework.StartsWith('net6.0')) or
32-
$(TargetFramework.StartsWith('net7.0'))
32+
$(TargetFramework.StartsWith('net7.0')) or
33+
$(TargetFramework.StartsWith('net8.0'))
3334
">$(DefineConstants);WORKAROUND_NULLABILITYINFO_BYREFTYPE</DefineConstants>
3435
</PropertyGroup>
3536

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
1111
<NoWarn>CS2002;$(NoWarn)</NoWarn>
1212
</PropertyGroup>
1313

14-
<Import Project="..\..\src\Sdk.net7.0.props" />
14+
<Import Project="..\..\src\Sdk.net8.0.props" />
1515

1616
<ItemGroup>
1717
<Compile Include="..\Common\**\*.cs" />
@@ -43,14 +43,14 @@ SPDX-License-Identifier: MIT
4343
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net6.0">
4444
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet60" />
4545
</MSBuild>
46-
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net7.0" Condition="$(TargetFrameworks.Contains('net7.0'))">
47-
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet70" />
46+
<MSBuild Projects="@(TestProjects)" Targets="Build" Properties="Configuration=Release;TargetFramework=net8.0" Condition="$(TargetFrameworks.Contains('net8.0'))">
47+
<Output TaskParameter="TargetOutputs" ItemName="TestAssembliesNet80" />
4848
</MSBuild>
4949

5050
<ItemGroup>
5151
<TestAssemblies Include="@(TestAssembliesNetStandard21)" />
5252
<TestAssemblies Include="@(TestAssembliesNet60)" />
53-
<TestAssemblies Include="@(TestAssembliesNet70)" />
53+
<TestAssemblies Include="@(TestAssembliesNet80)" />
5454
</ItemGroup>
5555

5656
<PropertyGroup>

‎tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/ApiListWriter.cs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -571,12 +571,12 @@ string[] ExpectedReferencedAssemblies
571571
}
572572
);
573573
#endif
574-
#if NET7_0_OR_GREATER
574+
#if NET8_0_OR_GREATER
575575
yield return (
576576
"Lib",
577-
"net7.0",
577+
"net8.0",
578578
new[] {
579-
"System.Runtime, Version=7.0.",
579+
"System.Runtime, Version=8.0.",
580580
}
581581
);
582582
#endif
@@ -620,14 +620,14 @@ string[] ExpectedReferencedAssemblies
620620
}
621621
);
622622
#endif
623-
#if NET7_0_OR_GREATER
623+
#if NET8_0_OR_GREATER
624624
yield return (
625625
"LibReferencedAssemblies1",
626-
"net7.0",
626+
"net8.0",
627627
new[] {
628-
"System.Runtime, Version=7.0.",
629-
"System.Threading, Version=7.0.",
630-
"System.Xml.ReaderWriter, Version=7.0.",
628+
"System.Runtime, Version=8.0.",
629+
"System.Threading, Version=8.0.",
630+
"System.Xml.ReaderWriter, Version=8.0.",
631631
}
632632
);
633633
#endif

‎tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/AssemblyLoader.cs‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ public void UsingAssembly_ArgumentNull_ComponentAssemblyPath(
101101
[TestCase(true, "net6.0")]
102102
[TestCase(false, "net6.0")]
103103
#endif
104-
#if NET7_0_OR_GREATER
105-
[TestCase(true, "net7.0")]
106-
[TestCase(false, "net7.0")]
104+
#if NET8_0_OR_GREATER
105+
[TestCase(true, "net8.0")]
106+
[TestCase(false, "net8.0")]
107107
#endif
108108
public void UsingAssembly(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
109109
{
@@ -210,9 +210,9 @@ public void UsingAssembly_ArgumentNull_ActionWithLoadedAssembly(bool loadIntoRef
210210
[TestCase(true, "net6.0")]
211211
[TestCase(false, "net6.0")]
212212
#endif
213-
#if NET7_0_OR_GREATER
214-
[TestCase(true, "net7.0")]
215-
[TestCase(false, "net7.0")]
213+
#if NET8_0_OR_GREATER
214+
[TestCase(true, "net8.0")]
215+
[TestCase(false, "net8.0")]
216216
#endif
217217
public void UsingAssembly_FromStream(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
218218
{
@@ -275,9 +275,9 @@ public void UsingAssembly_FromStream(bool loadIntoReflectionOnlyContext, string
275275
[TestCase(true, "net6.0")]
276276
[TestCase(false, "net6.0")]
277277
#endif
278-
#if NET7_0_OR_GREATER
279-
[TestCase(true, "net7.0")]
280-
[TestCase(false, "net7.0")]
278+
#if NET8_0_OR_GREATER
279+
[TestCase(true, "net8.0")]
280+
[TestCase(false, "net8.0")]
281281
#endif
282282
public void UsingAssembly_ResolveDependency_ProjectReference(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
283283
{
@@ -336,9 +336,9 @@ public void UsingAssembly_ResolveDependency_ProjectReference(bool loadIntoReflec
336336
[TestCase(true, "net6.0")]
337337
[TestCase(false, "net6.0")]
338338
#endif
339-
#if NET7_0_OR_GREATER
340-
[TestCase(true, "net7.0")]
341-
[TestCase(false, "net7.0")]
339+
#if NET8_0_OR_GREATER
340+
[TestCase(true, "net8.0")]
341+
[TestCase(false, "net8.0")]
342342
#endif
343343
public void UsingAssembly_FromStream_ResolveDependency_ProjectReference(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
344344
{
@@ -401,9 +401,9 @@ public void UsingAssembly_FromStream_ResolveDependency_ProjectReference(bool loa
401401
[TestCase(true, "net6.0")]
402402
[TestCase(false, "net6.0")]
403403
#endif
404-
#if NET7_0_OR_GREATER
405-
[TestCase(true, "net7.0")]
406-
[TestCase(false, "net7.0")]
404+
#if NET8_0_OR_GREATER
405+
[TestCase(true, "net8.0")]
406+
[TestCase(false, "net8.0")]
407407
#endif
408408
public void UsingAssembly_ResolveDependency_PackageReference(bool loadIntoReflectionOnlyContext, string targetFrameworkMoniker)
409409
{

‎tests/Smdn.Reflection.ReverseGenerating.ListApi.Core/Smdn.Reflection.ReverseGenerating.ListApi/FrameworkMonikers.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ namespace Smdn.Reflection.ReverseGenerating.ListApi;
88

99
[TestFixture]
1010
class FrameworkMonikersTests {
11+
[TestCase(".NETCoreApp,Version=v8.0", "net8.0")]
1112
[TestCase(".NETCoreApp,Version=v7.0", "net7.0")]
1213
[TestCase(".NETCoreApp,Version=v6.0", "net6.0")]
1314
[TestCase(".NETCoreApp,Version=v5.0", "net5.0")]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: MIT
1212
<Nullable>warnings</Nullable>
1313
</PropertyGroup>
1414

15-
<Import Project="..\..\src\Sdk.net7.0.props" />
15+
<Import Project="..\..\src\Sdk.net8.0.props" />
1616

1717
<ItemGroup>
1818
<Compile Include="..\Common\**\*.cs" />

‎tests/test-assm/LibA/LibA.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<TargetFrameworks>net6.0;netstandard2.1</TargetFrameworks>
44
</PropertyGroup>
55

6-
<Import Project="..\..\..\src\Sdk.net7.0.props" />
6+
<Import Project="..\..\..\src\Sdk.net8.0.props" />
77
</Project>

0 commit comments

Comments
 (0)