Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: removed .NET Core 3.1 target framework from Correlate.AspNetCore (EOL) #113

Merged
merged 1 commit into from
Sep 8, 2024
Merged

chore: removed .NET Core 3.1 target framework from Correlate.AspNetCore (EOL) #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,12 @@ Please consider that .NET Core 3.1 and up now has built-in support for [W3C Trac

### Supported .NET targets
- .NET 6.0, .NET 8.0
- .NET Standard 2.0/.NET Core 3.1
- .NET Standard 2.0

### ASP.NET Core support
- ASP.NET Core 6.0/8.0

### Build requirements
### Build/test requirements
- Visual Studio 2022
- .NET 8 SDK
- .NET 6 SDK
Expand Down
2 changes: 1 addition & 1 deletion src/Correlate.AspNetCore/Correlate.AspNetCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>

Expand Down
8 changes: 0 additions & 8 deletions test/Correlate.AspNetCore.Tests/AspNetCore/IntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,6 @@ public IntegrationTests(TestAppFactory<Startup> factory)

public void Dispose()
{
#if NETCOREAPP3_1
// NET Core 3.1 test host does not trigger application stopping token, but our diagnostics observable
// (subscribed in UseCorrelate) must unsubscribe before next test run.
// This is a bit crude but later versions of .NET test host do it properly.
// ReSharper disable once ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
IHostApplicationLifetime? appLifetime = _factory?.Services.GetRequiredService<IHostApplicationLifetime>();
appLifetime?.StopApplication();
#endif
// ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
_factory?.Dispose();
_mockHttp?.Dispose();
Expand Down
7 changes: 1 addition & 6 deletions test/Correlate.AspNetCore.Tests/Correlate.AspNetCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">

<PropertyGroup>
<TargetFrameworks>net8.0;net6.0;netcoreapp3.1</TargetFrameworks>
<TargetFrameworks>net8.0;net6.0</TargetFrameworks>
<IsTestProject>true</IsTestProject>
<RootNamespace>Correlate</RootNamespace>
</PropertyGroup>
Expand All @@ -16,11 +16,6 @@
<Serilog_AspNetCore>6.1.0</Serilog_AspNetCore>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='netcoreapp3.1'">
<Microsoft_AspNetCore_Mvc_Testing>3.1.32</Microsoft_AspNetCore_Mvc_Testing>
<Serilog_AspNetCore>6.1.0</Serilog_AspNetCore>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="$(Microsoft_AspNetCore_Mvc_Testing)" />
<PackageReference Include="Serilog.AspNetCore" Version="$(Serilog_AspNetCore)" />
Expand Down
Loading