Skip to content

Commit e41d9cd

Browse files
Feature/dotnet8 (#30)
* Fixes on startup and httpLogging configuration. * Upgrade SDK
1 parent 4b8b821 commit e41d9cd

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed

.github/workflows/pipeline.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ jobs:
1111
- name: Setup .NET
1212
uses: actions/setup-dotnet@v2
1313
with:
14-
dotnet-version: 7.0.x
14+
dotnet-version: 8.0.x
1515
- name: Restore dependencies
1616
run: dotnet restore ./Peppermint.ReverseProxy.sln
1717
- name: Build Portable

.github/workflows/qi.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515
- name: Setup .NET
1616
uses: actions/setup-dotnet@v2
1717
with:
18-
dotnet-version: 7.0.x
18+
dotnet-version: 8.0.x
1919
- name: Set up JDK 11
2020
uses: actions/setup-java@v1
2121
with:

.github/workflows/release.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
- name: Setup .NET
1414
uses: actions/setup-dotnet@v2
1515
with:
16-
dotnet-version: 7.0.x
16+
dotnet-version: 8.0.x
1717
- name: Restore dependencies
1818
run: dotnet restore src/Peppermint.ReverseProxy/Peppermint.ReverseProxy.csproj
1919
- name: Build Portable

src/Peppermint.ReverseProxy/Configuration/DefaultLoggingExtensions.cs

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
using Microsoft.AspNetCore.HttpLogging;
2-
using Serilog;
1+
using Serilog;
32

43
namespace Peppermint.ReverseProxy.Configuration
54
{

src/Peppermint.ReverseProxy/Peppermint.ReverseProxy.csproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Version>1.0.0</Version>
@@ -21,14 +21,14 @@
2121

2222
<ItemGroup>
2323
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.5" />
24-
<PackageReference Include="Serilog.AspNetCore" Version="7.0.0" />
25-
<PackageReference Include="Serilog.Extensions.Logging" Version="7.0.0" />
26-
<PackageReference Include="Serilog.Settings.Configuration" Version="7.0.1" />
24+
<PackageReference Include="Serilog.AspNetCore" Version="8.0.0" />
25+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
26+
<PackageReference Include="Serilog.Settings.Configuration" Version="8.0.0" />
2727
<PackageReference Include="SonarAnalyzer.CSharp" Version="9.12.0.78982">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3030
</PackageReference>
31-
<PackageReference Include="Yarp.ReverseProxy" Version="2.0.1" />
31+
<PackageReference Include="Yarp.ReverseProxy" Version="2.1.0" />
3232
</ItemGroup>
3333

3434
<ItemGroup>

src/Peppermint.ReverseProxy/Program.cs

+4
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ private static void Main(string[] args)
3131
// Dependencies injection
3232
services.AddDefaultLogging(config);
3333
services.AddYarpReverseProxy(builder);
34+
services.AddHttpLogging(httpLogger =>
35+
{
36+
httpLogger.CombineLogs = true;
37+
});
3438

3539
var app = builder.Build();
3640

tests/Peppermint.ReverseProxy.Tests/Peppermint.ReverseProxy.Tests.csproj

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
@@ -25,8 +25,8 @@
2525
</ItemGroup>
2626

2727
<ItemGroup>
28-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.13" />
29-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
28+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
29+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
3030
<PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
3131
<PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
3232
<PackageReference Include="NFluent" Version="3.0.1.352" />

0 commit comments

Comments
 (0)