Skip to content

Commit 619c776

Browse files
jchannonjchannon
committed
add .net9 support
1 parent 5d090f9 commit 619c776

File tree

16 files changed

+33
-37
lines changed

16 files changed

+33
-37
lines changed

‎.github/workflows/dotnetcore.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Setup .NET Core
2626
uses: actions/setup-dotnet@v2
2727
with:
28-
dotnet-version: 8.*
28+
dotnet-version: 9.*
2929
- name: Build Reason
3030
run: echo ${{github.ref}} and ${{github.event_name}}
3131
- name: Build with dotnet

‎samples/CarterAndMVC/CarterAndMVC.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<AssemblyName>CarterAndMVC</AssemblyName>
55
<OutputType>Exe</OutputType>
66
<LangVersion>latest</LangVersion>

‎samples/CarterSample/CarterSample.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
33
<ImplicitUsings>enable</ImplicitUsings>
4-
<TargetFramework>net8.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
8-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
8+
<PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
99

1010
</ItemGroup>
1111
<ItemGroup>

‎samples/ValidatorOnlyProject/ValidatorOnlyProject.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
6-
<PackageReference Include="FluentValidation" Version="11.8.0" />
6+
<PackageReference Include="FluentValidation" Version="11.11.0" />
77
</ItemGroup>
88
</Project>

‎src/Carter.Analyzers/Carter.Analyzers.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@
2727
</ItemGroup>
2828

2929
<ItemGroup>
30-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.7.0"/>
31-
<PackageReference Include="MinVer" Version="2.5.0">
30+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
31+
<PackageReference Include="MinVer" Version="6.0.0">
3232
<PrivateAssets>all</PrivateAssets>
3333
</PackageReference>
3434
</ItemGroup>

‎src/Carter.ResponseNegotiators.Newtonsoft/Carter.ResponseNegotiators.Newtonsoft.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Authors>Jonathan Channon</Authors>
55
<Description>Carter is framework that is a thin layer of extension methods and functionality over ASP.NET Core allowing code to be more explicit and most importantly more enjoyable.</Description>
66
<PackageTags>asp.net core;nancy;.net core;routing;carter</PackageTags>
@@ -21,7 +21,7 @@
2121
<ItemGroup>
2222
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
2323
<PackageReference Include="Carter" Version="8.0.0" />
24-
<PackageReference Include="MinVer" Version="2.5.0">
24+
<PackageReference Include="MinVer" Version="6.0.0">
2525
<PrivateAssets>all</PrivateAssets>
2626
</PackageReference>
2727
</ItemGroup>

‎src/Carter/Carter.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Authors>Jonathan Channon</Authors>
55
<Description>Carter is framework that is a thin layer of extension methods and functionality over ASP.NET Core allowing code to be more explicit and most importantly more enjoyable.</Description>
66
<PackageTags>asp.net core;nancy;.net core;routing;carter</PackageTags>
@@ -26,10 +26,10 @@
2626
<ProjectReference Include="..\Carter.Analyzers\Carter.Analyzers.csproj" OutputItemType="Analyzer" />
2727
</ItemGroup>
2828
<ItemGroup>
29-
<PackageReference Include="FluentValidation" Version="11.8.0" />
30-
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
31-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
32-
<PackageReference Include="MinVer" Version="2.5.0">
29+
<PackageReference Include="FluentValidation" Version="11.11.0" />
30+
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="9.0.0" />
31+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="all" />
32+
<PackageReference Include="MinVer" Version="6.0.0">
3333
<PrivateAssets>all</PrivateAssets>
3434
</PackageReference>
3535
</ItemGroup>

‎template/Template.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<PackageType>Template</PackageType>
55
<PackageId>CarterTemplate</PackageId>
66
<Description>A dotnet-new template for Carter applications.</Description>

‎template/content/CarterTemplate.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<AssemblyName>CarterTemplate</AssemblyName>
55
<OutputType>Exe</OutputType>
66
</PropertyGroup>

‎test/Carter.ResponseNegotiators.Newtonsoft.Tests/Carter.ResponseNegotiators.Newtonsoft.Tests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33

44
<ItemGroup>
5-
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.0"/>
5+
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
6+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
67
</ItemGroup>
78

89

‎test/Carter.Samples.Tests/Carter.Samples.Tests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
</None>
1111
</ItemGroup>
1212
<ItemGroup>
13-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.0" />
14-
<PackageReference Include="Shouldly" Version="4.0.3" />
13+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.0" />
14+
<PackageReference Include="Shouldly" Version="4.2.1" />
15+
<PackageReference Update="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
1516
</ItemGroup>
1617
</Project>

‎test/Carter.Tests/Analyzers/CSharpPreviewAnalyzerTest.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@ namespace Carter.Tests.Analyzers;
66
using Microsoft.CodeAnalysis.CSharp.Testing;
77
using Microsoft.CodeAnalysis.Diagnostics;
88
using Microsoft.CodeAnalysis.Testing;
9-
using Microsoft.CodeAnalysis.Testing.Verifiers;
109

11-
public sealed class CSharpPreviewAnalyzerTest<TAnalyzer> : CSharpAnalyzerTest<TAnalyzer, XUnitVerifier>
10+
public sealed class CSharpPreviewAnalyzerTest<TAnalyzer> : CSharpAnalyzerTest<TAnalyzer, DefaultVerifier>
1211
where TAnalyzer : DiagnosticAnalyzer, new()
1312
{
1413
public CSharpPreviewAnalyzerTest(string code)

‎test/Carter.Tests/Analyzers/CarterModuleShouldNotHaveDependenciesTests.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ namespace Carter.Tests.Analyzers;
33
using System.Threading.Tasks;
44
using Carter.Analyzers;
55
using Microsoft.CodeAnalysis.Testing;
6-
using Microsoft.CodeAnalysis.Testing.Verifiers;
76
using Xunit;
87

98
public sealed class CarterModuleShouldNotHaveDependenciesTests
@@ -346,7 +345,7 @@ public void AddRoutes(IEndpointRouteBuilder app) {}
346345

347346
private static Task VerifyAsync(string code, DiagnosticResult? diagnosticResult = null)
348347
{
349-
AnalyzerTest<XUnitVerifier> test = new CSharpPreviewAnalyzerTest<CarterModuleShouldNotHaveDependenciesAnalyzer>(code);
348+
AnalyzerTest<DefaultVerifier> test = new CSharpPreviewAnalyzerTest<CarterModuleShouldNotHaveDependenciesAnalyzer>(code);
350349
if (diagnosticResult.HasValue)
351350
{
352351
test.ExpectedDiagnostics.Add(diagnosticResult.Value);

‎test/Carter.Tests/AuthorizationTests.cs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -119,9 +119,8 @@ private class TestAuthenticationHandler : AuthenticationHandler<AuthenticationSc
119119
public TestAuthenticationHandler(
120120
IOptionsMonitor<AuthenticationSchemeOptions> options,
121121
ILoggerFactory logger,
122-
UrlEncoder encoder,
123-
ISystemClock clock)
124-
: base(options, logger, encoder, clock)
122+
UrlEncoder encoder)
123+
: base(options, logger, encoder)
125124
{
126125
}
127126

‎test/Carter.Tests/Carter.Tests.csproj

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2-
<ItemGroup>
3-
<PackageReference Include="fakeiteasy" Version="6.0.0" />
4-
</ItemGroup>
52
<ItemGroup>
63
<ProjectReference Include="..\..\src\Carter\Carter.csproj" />
74
<ProjectReference Include="..\..\src\Carter.Analyzers\Carter.Analyzers.csproj" />
85
</ItemGroup>
96
<ItemGroup>
10-
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.1.0" />
11-
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing.XUnit" Version="1.1.1" />
7+
<PackageReference Include="MartinCostello.Logging.XUnit" Version="0.4.0" />
8+
<PackageReference Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
129
</ItemGroup>
1310
</Project>

‎test/Directory.Build.props

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project>
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
77
<ItemGroup>
88
<FrameworkReference Include="Microsoft.AspNetCore.App" />
99
</ItemGroup>
1010
<ItemGroup>
11-
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
14-
<PackageReference Include="xunit" Version="2.4.2" />
11+
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="9.0.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.8.2" />
14+
<PackageReference Include="xunit" Version="2.9.2" />
1515
</ItemGroup>
1616
</Project>

0 commit comments

Comments
 (0)