Skip to content

Commit 2f07470

Browse files
glen-84glen-84
authored
Added .NET 9 (#7741)
1 parent 5c2a86a commit 2f07470

File tree

279 files changed

+32376
-1789
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

279 files changed

+32376
-1789
lines changed

‎.github/workflows/ci.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
pull_request:
55
branches:
66
- main
7+
- main-version-*
78

89
concurrency:
910
group: ci-new-2-${{ github.event.pull_request.number }}
@@ -121,7 +122,7 @@ jobs:
121122
website/.cache/yarn
122123
key: ${{ runner.os }}-yarn-${{ hashFiles('website/yarn.lock') }}
123124
restore-keys: |
124-
${{ runner.os }}-yarn-
125+
${{ runner.os }}-yarn-${{ hashFiles('website/yarn.lock') }}
125126
126127
- name: Install Packages
127128
run: yarn --immutable --network-timeout 100000
@@ -149,9 +150,7 @@ jobs:
149150
- name: Install .NET
150151
uses: actions/setup-dotnet@v4
151152
with:
152-
dotnet-version: |
153-
7.x
154-
8.x
153+
dotnet-version: 9.x
155154

156155
- name: Generate Test Matrix
157156
run: dotnet run --project ./.build -- GenerateMatrix
@@ -183,10 +182,11 @@ jobs:
183182
6.x
184183
7.x
185184
8.x
185+
9.x
186186
187187
- name: Run Build
188188
id: run-build
189-
run: dotnet build ${{ matrix.path }} --framework net8.0 --verbosity q
189+
run: dotnet build ${{ matrix.path }} --framework net9.0 --verbosity q
190190
timeout-minutes: 5
191191

192192
- name: Run tests
@@ -196,7 +196,7 @@ jobs:
196196
run: >
197197
dotnet test ${{ matrix.path }}
198198
--collect:"XPlat Code Coverage;Format=opencover"
199-
--framework net8.0
199+
--framework net9.0
200200
--logger trx
201201
--no-build
202202
--

‎.github/workflows/coverage.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ on:
44
push:
55
branches:
66
- main
7+
- main-version-*
78
paths:
89
- 'src/**'
910

@@ -28,9 +29,7 @@ jobs:
2829
- name: Install .NET
2930
uses: actions/setup-dotnet@v4
3031
with:
31-
dotnet-version: |
32-
7.x
33-
8.x
32+
dotnet-version: 9.x
3433

3534
- name: Generate Test Matrix
3635
run: dotnet run --project ./.build -- GenerateMatrix
@@ -61,10 +60,11 @@ jobs:
6160
6.x
6261
7.x
6362
8.x
63+
9.x
6464
6565
- name: Run Build
6666
id: run-build
67-
run: dotnet build ${{ matrix.path }} --framework net8.0 --verbosity q
67+
run: dotnet build ${{ matrix.path }} --framework net9.0 --verbosity q
6868
timeout-minutes: 5
6969

7070
- name: Run tests
@@ -74,7 +74,7 @@ jobs:
7474
run: >
7575
dotnet test ${{ matrix.path }}
7676
--collect:"XPlat Code Coverage;Format=opencover"
77-
--framework net8.0
77+
--framework net9.0
7878
--logger trx
7979
--no-build
8080
--verbosity q

‎.github/workflows/pr-labeler.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
name: Pull Request Labeler
22

33
on:
4-
pull_request_target:
5-
branches:
6-
- main
4+
pull_request_target
75

86
permissions:
97
contents: read

‎global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"sdk": {
3-
"version": "8.0.101",
3+
"version": "9.0.100",
44
"rollForward": "latestMinor"
55
}
66
}

‎src/CookieCrumble/src/CookieCrumble/CookieCrumble.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
<ProjectReference Include="..\..\..\HotChocolate\AspNetCore\src\Transport.Abstractions\HotChocolate.Transport.Abstractions.csproj" />
2222
</ItemGroup>
2323

24-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
24+
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0' Or '$(TargetFramework)' == 'net9.0'">
2525
<ProjectReference Include="..\..\..\HotChocolate\Fusion\src\Core\HotChocolate.Fusion.csproj" />
2626
</ItemGroup>
2727

‎src/CookieCrumble/src/CookieCrumble/TestEnvironment.cs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,11 @@ public static class TestEnvironment
2222
/// The target framework identifier.
2323
/// </summary>
2424
public const string TargetFramework = "NET8_0";
25+
#elif NET9_0
26+
/// <summary>
27+
/// The target framework identifier.
28+
/// </summary>
29+
public const string TargetFramework = "NET9_0";
2530
#endif
2631

2732
public static bool IsLocalEnvironment()

‎src/Directory.Build.props

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,13 +40,13 @@
4040
</PropertyGroup>
4141

4242
<PropertyGroup>
43-
<LibraryTargetFrameworks>net8.0; net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
44-
<Library2TargetFrameworks>net8.0; net7.0; net6.0</Library2TargetFrameworks>
45-
<Library3TargetFrameworks>net8.0; net7.0</Library3TargetFrameworks>
46-
<TestTargetFrameworks>net8.0; net7.0; net6.0</TestTargetFrameworks>
47-
<AspNetTargetFrameworks>net8.0; net7.0; net6.0</AspNetTargetFrameworks>
43+
<LibraryTargetFrameworks>net9.0; net8.0; net7.0; net6.0; netstandard2.0</LibraryTargetFrameworks>
44+
<Library2TargetFrameworks>net9.0; net8.0; net7.0; net6.0</Library2TargetFrameworks>
45+
<Library3TargetFrameworks>net9.0; net8.0; net7.0</Library3TargetFrameworks>
46+
<TestTargetFrameworks>net9.0; net8.0; net7.0; net6.0</TestTargetFrameworks>
47+
<AspNetTargetFrameworks>net9.0; net8.0; net7.0; net6.0</AspNetTargetFrameworks>
4848
<AzfTargetFrameworks>net7.0; net6.0</AzfTargetFrameworks>
49-
<AzfIsoProcTargetFrameworks>net8.0; net7.0; net6.0</AzfIsoProcTargetFrameworks>
49+
<AzfIsoProcTargetFrameworks>net9.0; net8.0; net7.0; net6.0</AzfIsoProcTargetFrameworks>
5050
<SourceGenTargetFrameworks>netstandard2.0</SourceGenTargetFrameworks>
5151
</PropertyGroup>
5252

‎src/Directory.Packages.props

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
<PackageVersion Include="Aspire.Hosting.Redis" Version="8.0.0" />
1313
<PackageVersion Include="AutoMapper" Version="10.1.1" />
1414
<PackageVersion Include="ChilliCream.Nitro.App" Version="$(NitroVersion)" />
15-
<PackageVersion Include="Basic.Reference.Assemblies" Version="1.6.0" />
15+
<PackageVersion Include="Basic.Reference.Assemblies.Net80" Version="1.7.8" />
16+
<PackageVersion Include="Basic.Reference.Assemblies.Net90" Version="1.7.8" />
1617
<PackageVersion Include="ChilliCream.Testing.Utilities" Version="0.2.0" />
1718
<PackageVersion Include="coverlet.collector" Version="6.0.2" />
1819
<PackageVersion Include="DiffPlex" Version="1.7.2" />
@@ -21,16 +22,16 @@
2122
<PackageVersion Include="Glob" Version="1.1.9" />
2223
<PackageVersion Include="IdentityModel" Version="4.1.1" />
2324
<PackageVersion Include="JsonPointer.Net" Version="5.0.0" />
24-
<PackageVersion Include="Marten" Version="7.4.0" />
25+
<PackageVersion Include="Marten" Version="7.33.0" />
2526
<PackageVersion Include="McMaster.Extensions.CommandLineUtils" Version="4.0.1" />
2627
<PackageVersion Include="Microsoft.Azure.Functions.Extensions" Version="1.1.0" />
2728
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Core" Version="1.4.0" />
2829
<PackageVersion Include="Microsoft.Azure.Functions.Worker.Extensions.Abstractions" Version="1.1.0" />
2930
<PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
3031
<PackageVersion Include="Microsoft.Bcl.TimeProvider" Version="8.0.1" />
31-
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
32-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.1.0" />
33-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.1.0" />
32+
<PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
33+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
34+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.9.2" />
3435
<PackageVersion Include="Microsoft.Extensions.Identity.Core" Version="7.0.3" />
3536
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
3637
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.14" />
@@ -48,8 +49,8 @@
4849
<PackageVersion Include="RavenDB.Client" Version="6.0.104" />
4950
<PackageVersion Include="Snapshooter.Xunit" Version="0.5.4" />
5051
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
51-
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.8" />
52-
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.8" />
52+
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.10" />
53+
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.10" />
5354
<PackageVersion Include="Squadron.Mongo" Version="0.23.0" />
5455
<PackageVersion Include="Squadron.Nats" Version="0.18.0" />
5556
<PackageVersion Include="Squadron.PostgreSql" Version="0.18.0" />
@@ -66,6 +67,30 @@
6667
<PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
6768
</ItemGroup>
6869

70+
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
71+
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="9.0.0" />
72+
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
73+
<PackageVersion Include="Microsoft.AspNetCore.WebUtilities" Version="9.0.0" />
74+
<PackageVersion Include="Microsoft.Data.Sqlite.Core" Version="9.0.0" />
75+
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="9.0.0" />
76+
<PackageVersion Include="Microsoft.EntityFrameworkCore.InMemory" Version="9.0.0" />
77+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
78+
<PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
79+
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="9.0.0" />
80+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
81+
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
82+
<PackageVersion Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />
83+
<PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.0" />
84+
<PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.0" />
85+
<PackageVersion Include="Microsoft.Extensions.Options" Version="9.0.0" />
86+
<PackageVersion Include="Microsoft.Net.Http.Headers" Version="9.0.0" />
87+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.0" />
88+
<PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL.NetTopologySuite" Version="9.0.0" />
89+
<PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" />
90+
<PackageVersion Include="System.IO.Packaging" Version="9.0.0" />
91+
<PackageVersion Include="System.IO.Pipelines" Version="9.0.0" />
92+
</ItemGroup>
93+
6994
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
7095
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="8.0.0" />
7196
<PackageVersion Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />

‎src/HotChocolate/AspNetCore/src/AspNetCore.Authorization.Opa/Request/DefaultQueryRequestFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public OpaQueryRequest CreateRequest(AuthorizationContext context, AuthorizeDire
2626

2727
var originalRequest = new OriginalRequest(
2828
httpContext.Request.Headers,
29-
httpContext.Request.Host.Value,
29+
httpContext.Request.Host.Value ?? string.Empty,
3030
httpContext.Request.Method,
3131
httpContext.Request.Path.Value!,
3232
httpContext.Request.Query,

‎src/HotChocolate/Core/src/Abstractions/Error.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1+
#if !NET9_0_OR_GREATER
12
using HotChocolate.Execution;
3+
#endif
24
using HotChocolate.Properties;
35

46
namespace HotChocolate;

0 commit comments

Comments
 (0)