Skip to content

Commit 6d339a8

Browse files
jscarlejscarle
authored
Upgrade extensions to target .NET 10 (#31)
* Update frameworks to .NET 10 * Remove ILLink.Tasks references for specific frameworks Removed conditional PackageReference entries for Microsoft.NET.ILLink.Tasks. * Update IsAotCompatible property in csproj file * Remove ILLink.Tasks references for specific frameworks Removed conditional PackageReference for Microsoft.NET.ILLink.Tasks. * Update LightResults.Extensions.Json.csproj * Simplify AOT compatibility and package references Removed conditional PackageReference entries for Microsoft.NET.ILLink.Tasks. * Update IsAotCompatible and remove package references Removed conditional package references for Microsoft.NET.ILLink.Tasks. * Change target frameworks to net10.0 * Change target frameworks to net10.0 * Reference ExceptionHandling project (#32)
1 parent 5d15119 commit 6d339a8

File tree

15 files changed

+65
-150
lines changed

15 files changed

+65
-150
lines changed

‎.github/workflows/docs.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,10 @@ jobs:
2929
- name: Setup Pages
3030
uses: actions/configure-pages@v4
3131

32-
- name: Setup .NET 9.0
32+
- name: Setup .NET 10.0
3333
uses: actions/setup-dotnet@v4
3434
with:
35-
dotnet-version: 9.x
35+
dotnet-version: 10.x
3636

3737
- name: Setup docfx
3838
run: dotnet tool update -g docfx

‎.github/workflows/publish.yml‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ jobs:
1717
- name: Checkout repository
1818
uses: actions/checkout@v4
1919

20-
- name: Setup .NET 6.0
21-
uses: actions/setup-dotnet@v4
22-
with:
23-
dotnet-version: 6.x
24-
25-
- name: Setup .NET 7.0
26-
uses: actions/setup-dotnet@v4
27-
with:
28-
dotnet-version: 7.x
29-
3020
- name: Setup .NET 8.0
3121
uses: actions/setup-dotnet@v4
3222
with:
@@ -37,6 +27,11 @@ jobs:
3727
with:
3828
dotnet-version: 9.x
3929

30+
- name: Setup .NET 10.0
31+
uses: actions/setup-dotnet@v4
32+
with:
33+
dotnet-version: 10.x
34+
4035
- name: Restore dependencies
4136
run: dotnet restore
4237

‎.github/workflows/test.yml‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,16 +25,6 @@ jobs:
2525
with:
2626
languages: 'csharp'
2727

28-
- name: Setup .NET 6.0
29-
uses: actions/setup-dotnet@v4
30-
with:
31-
dotnet-version: 6.x
32-
33-
- name: Setup .NET 7.0
34-
uses: actions/setup-dotnet@v4
35-
with:
36-
dotnet-version: 7.x
37-
3828
- name: Setup .NET 8.0
3929
uses: actions/setup-dotnet@v4
4030
with:
@@ -45,14 +35,19 @@ jobs:
4535
with:
4636
dotnet-version: 9.x
4737

38+
- name: Setup .NET 10.0
39+
uses: actions/setup-dotnet@v4
40+
with:
41+
dotnet-version: 10.x
42+
4843
- name: Restore dependencies
4944
run: dotnet restore
5045

5146
- name: Build
5247
run: dotnet build --configuration Release --no-restore
5348

5449
- name: Test
55-
run: dotnet test --configuration Release --no-build --verbosity normal --framework net8.0
50+
run: dotnet test --configuration Release --no-build --verbosity normal --framework net10.0
5651

5752
- name: Perform CodeQL analysis
5853
uses: github/codeql-action/analyze@v3

‎.gitignore‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ obj/
1414

1515
# Docs
1616
docfx/_site/**
17-
docfx/netstandard2.0/**
18-
docfx/net6.0/**
19-
docfx/net7.0/**
2017
docfx/net8.0/**
18+
docfx/net9.0/**
19+
docfx/net10.0/**

‎AGENTS.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Always verify your changes by running the same steps as CI:
2525
dotnet test --configuration Release --no-build --verbosity normal --framework net8.0
2626
```
2727

28-
The solution targets multiple frameworks (net6.0–net9.0). Make sure all target frameworks compile.
28+
The solution targets multiple frameworks (net8.0–net10.0). Make sure all target frameworks compile.
2929

3030
## Coding style
3131

‎docfx/docfx.json‎

Lines changed: 6 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,5 @@
11
{
22
"metadata": [
3-
{
4-
"src": [
5-
{
6-
"src": "../src/LightResults.Extensions.ExceptionHandling",
7-
"files": [
8-
"**/*.csproj"
9-
]
10-
}
11-
],
12-
"outputFormat": "apiPage",
13-
"dest": "netstandard2.0",
14-
"properties": {
15-
"TargetFramework": "netstandard2.0"
16-
}
17-
},
183
{
194
"src": [
205
{
@@ -25,24 +10,9 @@
2510
}
2611
],
2712
"outputFormat": "apiPage",
28-
"dest": "net6.0",
29-
"properties": {
30-
"TargetFramework": "net6.0"
31-
}
32-
},
33-
{
34-
"src": [
35-
{
36-
"src": "../src",
37-
"files": [
38-
"**/*.csproj"
39-
]
40-
}
41-
],
42-
"outputFormat": "apiPage",
43-
"dest": "net7.0",
13+
"dest": "net8.0",
4414
"properties": {
45-
"TargetFramework": "net7.0"
15+
"TargetFramework": "net8.0"
4616
}
4717
},
4818
{
@@ -55,9 +25,9 @@
5525
}
5626
],
5727
"outputFormat": "apiPage",
58-
"dest": "net8.0",
28+
"dest": "net9.0",
5929
"properties": {
60-
"TargetFramework": "net8.0"
30+
"TargetFramework": "net9.0"
6131
}
6232
},
6333
{
@@ -70,9 +40,9 @@
7040
}
7141
],
7242
"outputFormat": "apiPage",
73-
"dest": "net9.0",
43+
"dest": "net10.0",
7444
"properties": {
75-
"TargetFramework": "net9.0"
45+
"TargetFramework": "net10.0"
7646
}
7747
}
7848
],

‎docfx/toc.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
- name: Docs
22
href: docs/
3-
- name: .NET Standard 2.0
4-
href: netstandard2.0/
5-
- name: .NET 6.0
6-
href: net6.0/
7-
- name: .NET 7.0
8-
href: net7.0/
93
- name: .NET 8.0
104
href: net8.0/
115
- name: .NET 9.0
126
href: net9.0/
7+
- name: .NET 10.0
8+
href: net10.0/

‎src/LightResults.Extensions.EntityFrameworkCore/LightResults.Extensions.EntityFrameworkCore.csproj‎

Lines changed: 9 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Compilation -->
44
<PropertyGroup>
55
<RootNamespace>LightResults.Extensions.EntityFrameworkCore</RootNamespace>
6-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<LangVersion>latest</LangVersion>
@@ -16,14 +16,6 @@
1616
</PropertyGroup>
1717

1818
<!-- References -->
19-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
20-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.36"/>
21-
</ItemGroup>
22-
23-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
24-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.20"/>
25-
</ItemGroup>
26-
2719
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
2820
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.18"/>
2921
</ItemGroup>
@@ -32,17 +24,21 @@
3224
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.7"/>
3325
</ItemGroup>
3426

27+
<ItemGroup Condition="'$(TargetFramework)' == 'net10.0'">
28+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="10.0.0"/>
29+
</ItemGroup>
30+
3531
<ItemGroup>
36-
<PackageReference Include="LightResults" Version="9.0.5"/>
32+
<PackageReference Include="LightResults" Version="10.0.0"/>
3733
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
3834
</ItemGroup>
3935

4036
<!-- Output -->
4137
<PropertyGroup>
4238
<AssemblyName>LightResults.Extensions.EntityFrameworkCore</AssemblyName>
43-
<Version>9.0.1</Version>
44-
<AssemblyVersion>9.0.1.0</AssemblyVersion>
45-
<FileVersion>9.0.1.0</FileVersion>
39+
<Version>10.0.0</Version>
40+
<AssemblyVersion>10.0.0.0</AssemblyVersion>
41+
<FileVersion>10.0.0.0</FileVersion>
4642
<NeutralLanguage>en-US</NeutralLanguage>
4743
<Optimize>true</Optimize>
4844
<!-- IsAotCompatible cannot be enabled because of Entity Framework Core limitations -->

‎src/LightResults.Extensions.ExceptionHandling/LightResults.Extensions.ExceptionHandling.csproj‎

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Compilation -->
44
<PropertyGroup>
55
<RootNamespace>LightResults.Extensions.ExceptionHandling</RootNamespace>
6-
<TargetFrameworks>netstandard2.0;net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<LangVersion>latest</LangVersion>
@@ -18,19 +18,19 @@
1818
<!-- References -->
1919

2020
<ItemGroup>
21-
<PackageReference Include="LightResults" Version="9.0.5"/>
21+
<PackageReference Include="LightResults" Version="10.0.0"/>
2222
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
2323
</ItemGroup>
2424

2525
<!-- Output -->
2626
<PropertyGroup>
2727
<AssemblyName>LightResults.Extensions.ExceptionHandling</AssemblyName>
28-
<Version>9.0.2</Version>
29-
<AssemblyVersion>9.0.2.0</AssemblyVersion>
30-
<FileVersion>9.0.2.0</FileVersion>
28+
<Version>10.0.0</Version>
29+
<AssemblyVersion>10.0.0.0</AssemblyVersion>
30+
<FileVersion>10.0.0.0</FileVersion>
3131
<NeutralLanguage>en-US</NeutralLanguage>
3232
<Optimize>true</Optimize>
33-
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
33+
<IsAotCompatible>true</IsAotCompatible>
3434
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
3535
</PropertyGroup>
3636

@@ -63,17 +63,5 @@
6363
<ItemGroup>
6464
<InternalsVisibleTo Include="LightResults.Extensions.Tests"/>
6565
</ItemGroup>
66-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
67-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.6.3"/>
68-
</ItemGroup>
69-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
70-
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.7"/>
71-
</ItemGroup>
72-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
73-
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.7"/>
74-
</ItemGroup>
75-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
76-
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.7"/>
77-
</ItemGroup>
7866

7967
</Project>

‎src/LightResults.Extensions.Json/LightResults.Extensions.Json.csproj‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- Compilation -->
44
<PropertyGroup>
55
<RootNamespace>LightResults.Extensions.Json</RootNamespace>
6-
<TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
6+
<TargetFrameworks>net8.0;net9.0;net10.0</TargetFrameworks>
77
<ImplicitUsings>enable</ImplicitUsings>
88
<Nullable>enable</Nullable>
99
<LangVersion>latest</LangVersion>
@@ -17,19 +17,19 @@
1717

1818
<!-- References -->
1919
<ItemGroup>
20-
<PackageReference Include="LightResults" Version="9.0.5"/>
20+
<PackageReference Include="LightResults" Version="10.0.0"/>
2121
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All"/>
2222
</ItemGroup>
2323

2424
<!-- Output -->
2525
<PropertyGroup>
2626
<AssemblyName>LightResults.Extensions.Json</AssemblyName>
27-
<Version>9.0.1</Version>
28-
<AssemblyVersion>9.0.1.0</AssemblyVersion>
29-
<FileVersion>9.0.1.0</FileVersion>
27+
<Version>10.0.0</Version>
28+
<AssemblyVersion>10.0.0.0</AssemblyVersion>
29+
<FileVersion>10.0.0.0</FileVersion>
3030
<NeutralLanguage>en-US</NeutralLanguage>
3131
<Optimize>true</Optimize>
32-
<IsAotCompatible Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net7.0'))">true</IsAotCompatible>
32+
<IsAotCompatible>true</IsAotCompatible>
3333
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\$(AssemblyName).xml</DocumentationFile>
3434
</PropertyGroup>
3535

@@ -62,14 +62,5 @@
6262
<ItemGroup>
6363
<InternalsVisibleTo Include="LightResults.Extensions.Tests"/>
6464
</ItemGroup>
65-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
66-
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.7"/>
67-
</ItemGroup>
68-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
69-
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.7"/>
70-
</ItemGroup>
71-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
72-
<PackageReference Include="Microsoft.NET.ILLink.Tasks" Version="9.0.7"/>
73-
</ItemGroup>
7465

7566
</Project>

0 commit comments

Comments
 (0)