Skip to content

Commit 25700d7

Browse files
jeremydmillerjeremydmiller
committed
first cut at .net 9 support
1 parent e4bb8ff commit 25700d7

33 files changed

+94
-82
lines changed

‎.github/workflows/docs-prs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,11 @@ jobs:
4242
uses: actions/setup-dotnet@v3
4343
with:
4444
dotnet-version: 8.0.x
45+
46+
- name: Install .NET 9.0.x
47+
uses: actions/setup-dotnet@v3
48+
with:
49+
dotnet-version: 9.0.x
4550

4651
- name: Build docs
4752
run: ./build.sh docs-build

‎.github/workflows/docs.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ jobs:
4141
uses: actions/setup-dotnet@v3
4242
with:
4343
dotnet-version: 8.0.x
44+
45+
- name: Install .NET 9.0.x
46+
uses: actions/setup-dotnet@v3
47+
with:
48+
dotnet-version: 9.0.x
4449

4550
- name: Build & Deploy docs preview
4651
run: |

‎.github/workflows/on-manual-do-nuget-publish.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@ jobs:
3030
uses: actions/setup-dotnet@v3
3131
with:
3232
dotnet-version: 8.0.x
33+
34+
- name: Install .NET 9.0.x
35+
uses: actions/setup-dotnet@v3
36+
with:
37+
dotnet-version: 9.0.x
3338

3439
- name: Install .NET Aspire workload
3540
run: |

‎.github/workflows/on-push-do-ci-build-pg12-plv8-jsonnet.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
pg_db: marten_testing
2424
pg_user: postgres
2525
CONFIGURATION: Release
26-
FRAMEWORK: net7.0
26+
FRAMEWORK: net9.0
2727
DISABLE_TEST_PARALLELIZATION: true
2828
DEFAULT_SERIALIZER: "Newtonsoft"
2929
NUKE_TELEMETRY_OPTOUT: true
@@ -66,6 +66,11 @@ jobs:
6666
uses: actions/setup-dotnet@v3
6767
with:
6868
dotnet-version: 8.0.x
69+
70+
- name: Install .NET 9.0.x
71+
uses: actions/setup-dotnet@v3
72+
with:
73+
dotnet-version: 9.0.x
6974

7075
- name: Install .NET Aspire workload
7176
run: |

‎.github/workflows/on-push-do-ci-build-pg12-plv8-systemtextjson.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ jobs:
6666
uses: actions/setup-dotnet@v3
6767
with:
6868
dotnet-version: 8.0.x
69+
70+
- name: Install .NET 9.0.x
71+
uses: actions/setup-dotnet@v3
72+
with:
73+
dotnet-version: 9.0.x
6974

7075
- name: Install .NET Aspire workload
7176
run: |

‎.github/workflows/on-push-do-ci-build-pg15-jsonnet.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ env:
2323
pg_db: marten_testing
2424
pg_user: postgres
2525
CONFIGURATION: Release
26-
FRAMEWORK: net8.0
26+
FRAMEWORK: net9.0
2727
DISABLE_TEST_PARALLELIZATION: true
2828
DEFAULT_SERIALIZER: "Newtonsoft"
2929
NUKE_TELEMETRY_OPTOUT: true
@@ -66,6 +66,11 @@ jobs:
6666
uses: actions/setup-dotnet@v3
6767
with:
6868
dotnet-version: 8.0.x
69+
70+
- name: Install .NET 9.0.x
71+
uses: actions/setup-dotnet@v3
72+
with:
73+
dotnet-version: 9.0.x
6974

7075
- name: Install .NET Aspire workload
7176
run: |

‎.github/workflows/on-push-do-ci-build-pgLatest-systemtextjson.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,11 @@ jobs:
6666
uses: actions/setup-dotnet@v3
6767
with:
6868
dotnet-version: 8.0.x
69+
70+
- name: Install .NET 9.0.x
71+
uses: actions/setup-dotnet@v3
72+
with:
73+
dotnet-version: 9.0.x
6974

7075
- name: Install .NET Aspire workload
7176
run: |

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project>
33
<PropertyGroup>
4-
<Version>7.31.3</Version>
4+
<Version>7.32.0</Version>
55
<LangVersion>12.0</LangVersion>
66
<Authors>Jeremy D. Miller;Babu Annamalai;Oskar Dudycz;Joona-Pekka Kokko</Authors>
77
<PackageIconUrl>https://martendb.io/logo.png</PackageIconUrl>

‎src/CoreTests/CoreTests.csproj

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
3+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
44
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
55
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
66
</PropertyGroup>
@@ -16,9 +16,7 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="13.0.0" />
20-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
21-
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
19+
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="14.0.1" />
2220
<PackageReference Include="Jil" Version="3.0.0-alpha2" />
2321
<PackageReference Include="Microsoft.FeatureManagement" Version="3.2.0" />
2422
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />

‎src/DaemonTests/DaemonTests.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
4+
<TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
88
<PackageReference Include="Confluent.Kafka" Version="2.3.0" />
9-
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="13.0.2" />
10-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/>
11-
<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0"/>
12-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
9+
<PackageReference Include="Lamar.Microsoft.DependencyInjection" Version="14.0.1" />
1310
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0"/>
1411
<PackageReference Include="Divergic.Logging.Xunit" Version="4.3.0"/>
1512
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />

0 commit comments

Comments
 (0)