Skip to content

Commit 3fd01c2

Browse files
ikesnowyikesnowy
committed
chore: drop net8 support
1 parent 24a4e68 commit 3fd01c2

File tree

12 files changed

+33
-79
lines changed

12 files changed

+33
-79
lines changed

‎.github/workflows/ci.yml

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,6 @@ on:
77
branches: [ "main" ]
88

99
jobs:
10-
test-net8:
11-
runs-on: ubuntu-latest
12-
container: mcr.microsoft.com/dotnet/sdk:8.0
13-
14-
steps:
15-
- name: Checkout
16-
uses: actions/checkout@v3
17-
- name: Build
18-
run: ./build.sh net8.0
19-
- name: Test
20-
run: ./test.sh net8.0
21-
2210
test-net9:
2311
runs-on: ubuntu-latest
2412
container: mcr.microsoft.com/dotnet/sdk:9.0

‎Directory.Build.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project>
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
4+
<TargetFramework>net9.0</TargetFramework>
55
<Nullable>enable</Nullable>
66
<ImplicitUsings>enable</ImplicitUsings>
77
<Authors>Cnblogs</Authors>

‎src/Cnblogs.Architecture.Ddd.Cqrs.Abstractions/Cnblogs.Architecture.Ddd.Cqrs.Abstractions.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,6 @@
1717

1818
<ItemGroup>
1919
<PackageReference Include="Mapster" Version="7.4.0" />
20-
</ItemGroup>
21-
22-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
23-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
24-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.8" />
25-
</ItemGroup>
26-
27-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
2820
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.8" />
2921
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.8" />
3022
</ItemGroup>

‎src/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore/Cnblogs.Architecture.Ddd.Cqrs.AspNetCore.csproj

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,7 @@
99
<ItemGroup>
1010
<PackageReference Include="Asp.Versioning.Mvc.ApiExplorer" Version="8.1.0" />
1111
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
12-
</ItemGroup>
13-
14-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
15-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.19" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
19-
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.19" />
12+
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.8" />
2013
</ItemGroup>
2114

2215
<ItemGroup>

‎src/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory/Cnblogs.Architecture.Ddd.Infrastructure.CacheProviders.InMemory.csproj

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,7 @@
99
<ItemGroup>
1010
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection\Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.csproj"/>
1111
<ProjectReference Include="..\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions\Cnblogs.Architecture.Ddd.Infrastructure.Abstractions.csproj"/>
12-
</ItemGroup>
13-
14-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
15-
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.8" />
16-
</ItemGroup>
17-
18-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
1912
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="9.0.8" />
2013
</ItemGroup>
2114

22-
2315
</Project>

‎src/Cnblogs.Architecture.Ddd.Infrastructure.Dapper/Cnblogs.Architecture.Ddd.Infrastructure.Dapper.csproj

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,6 @@
1010

1111
<ItemGroup>
1212
<PackageReference Include="Dapper" Version="2.1.66" />
13-
</ItemGroup>
14-
15-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
16-
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.8" />
17-
</ItemGroup>
18-
19-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
2013
<PackageReference Include="Microsoft.Extensions.Options" Version="9.0.8" />
2114
</ItemGroup>
2215

‎test/Cnblogs.Architecture.IntegrationTestProject/Cnblogs.Architecture.IntegrationTestProject.csproj

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@
55
<ProjectReference Include="..\Cnblogs.Architecture.TestIntegrationEvents\Cnblogs.Architecture.TestIntegrationEvents.csproj" />
66
</ItemGroup>
77

8-
9-
10-
118
</Project>

‎test/Cnblogs.Architecture.IntegrationTests/Cnblogs.Architecture.IntegrationTests.csproj

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,9 @@
1010
<PrivateAssets>all</PrivateAssets>
1111
</PackageReference>
1212
<PackageReference Include="Serilog.Sinks.InMemory" Version="0.16.0" />
13-
<PackageReference Include="Serilog.Sinks.InMemory.Assertions" Version="0.16.0" />
1413
<PackageReference Include="Serilog.AspNetCore" Version="9.0.0" />
14+
<PackageReference Include="xunit" Version="2.9.3" />
15+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1516
</ItemGroup>
1617

1718
<ItemGroup>

‎test/Cnblogs.Architecture.IntegrationTests/IntegrationEventHandlerTests.cs

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
using Microsoft.AspNetCore.TestHost;
88
using Microsoft.Extensions.Logging;
99
using Serilog;
10+
using Serilog.Events;
1011
using Serilog.Sinks.InMemory;
11-
using Serilog.Sinks.InMemory.Assertions;
1212
using Xunit.Abstractions;
1313
using static Cnblogs.Architecture.IntegrationTestProject.Constants;
1414

@@ -40,8 +40,13 @@ public async Task IntegrationEventHandler_TestIntegrationEvent_SuccessAsync()
4040

4141
// Assert
4242
Assert.True(response.IsSuccessStatusCode);
43-
InMemorySink.Instance
44-
.Should().HaveMessage(LogTemplates.HandledIntegratonEvent).Appearing().Once()
45-
.WithProperty("event").HavingADestructuredObject().WithProperty("Id").WithValue(@event.Id);
43+
var messages =
44+
InMemorySink.Instance.LogEvents
45+
.Where(x => x.MessageTemplate.Text == LogTemplates.HandledIntegratonEvent)
46+
.ToList();
47+
var msg = Assert.Single(messages)!;
48+
var value = msg.Properties["event"] as StructureValue;
49+
Assert.NotNull(value);
50+
Assert.Contains(value.Properties, prop => prop.Name == "Id" && prop.Value.ToString() == @event.Id.ToString());
4651
}
4752
}

‎test/Cnblogs.Architecture.TestShared/Cnblogs.Architecture.TestShared.csproj

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<ItemGroup>
33
<PackageReference Include="NSubstitute" Version="5.3.0"/>
4-
</ItemGroup>
5-
6-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
7-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.19" />
8-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
9-
</ItemGroup>
10-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.19" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
4+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="9.0.8" />
135
</ItemGroup>
146
</Project>

0 commit comments

Comments
 (0)