Skip to content

Commit c795db2

Browse files
committed
build(backend): upgrade dotnet to 8.0
1 parent 9a86c55 commit c795db2

File tree

10 files changed

+36
-27
lines changed

10 files changed

+36
-27
lines changed

backend/dev.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM mcr.microsoft.com/dotnet/sdk:7.0
1+
FROM mcr.microsoft.com/dotnet/sdk:8.0
22

33
# needed in sln file
44
RUN mkdir /build && echo '<?xml version="1.0" encoding="utf-8"?><Project ToolsVersion="15.0" Sdk="Microsoft.Docker.Sdk"></Project>' > /build/docker-compose.dcproj

backend/global.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"sdk": {
3+
"version": "8.0.0",
4+
"rollForward": "latestMajor",
5+
"allowPrerelease": false
6+
}
7+
}

backend/src/AcmStatisticsBackend.Application/AcmStatisticsBackend.Application.csproj

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<VersionPrefix>1.0.0.0</VersionPrefix>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Application</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Application</PackageId>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -21,6 +21,9 @@
2121
<ProjectReference Include="..\AcmStatisticsBackend.Core\AcmStatisticsBackend.Core.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="SauceControl.InheritDoc" Version="1.4.0" />
24+
<PackageReference Include="SauceControl.InheritDoc" Version="2.0.2">
25+
<PrivateAssets>all</PrivateAssets>
26+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
27+
</PackageReference>
2528
</ItemGroup>
2629
</Project>

backend/src/AcmStatisticsBackend.Application/Crawlers/Dto/QueryWorkerHistoryDto.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.Diagnostics.CodeAnalysis;
44
using Abp.AutoMapper;
55
using Abp.Runtime.Validation;
6-
using Castle.Core.Internal;
76

87
namespace AcmStatisticsBackend.Crawlers.Dto
98
{
@@ -63,7 +62,7 @@ public class QueryWorkerHistoryDto : ICustomValidate
6362

6463
public void AddValidationErrors(CustomValidationContext context)
6564
{
66-
if (!ErrorMessage.IsNullOrEmpty())
65+
if (!string.IsNullOrEmpty(ErrorMessage))
6766
{
6867
if (SolvedList != null || SubmissionsByCrawlerName != null)
6968
{

backend/src/AcmStatisticsBackend.Core/AcmStatisticsBackend.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<VersionPrefix>1.0.0.0</VersionPrefix>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Core</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Core</PackageId>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -16,7 +16,7 @@
1616
<ItemGroup>
1717
<PackageReference Include="Abp.AutoMapper" Version="8.4.0" />
1818
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="8.4.0" />
19-
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />
20-
<PackageReference Include="Flurl.Http" Version="3.2.4" />
19+
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="4.1.0" />
20+
<PackageReference Include="Flurl.Http" Version="4.0.2" />
2121
</ItemGroup>
2222
</Project>

backend/src/AcmStatisticsBackend.EntityFrameworkCore/AcmStatisticsBackend.EntityFrameworkCore.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<RootNamespace>AcmStatisticsBackend</RootNamespace>
55
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
66
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
88
</PropertyGroup>
99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.20">
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.19">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
14+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.3" />
1515
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Design" Version="1.1.2" />
1616
</ItemGroup>
1717
<ItemGroup>

backend/src/AcmStatisticsBackend.Web.Core/AcmStatisticsBackend.Web.Core.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<VersionPrefix>1.0.0.0</VersionPrefix>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Web.Core</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Web.Core</PackageId>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -21,8 +21,8 @@
2121
<ProjectReference Include="..\AcmStatisticsBackend.EntityFrameworkCore\AcmStatisticsBackend.EntityFrameworkCore.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.20" />
25-
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
24+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.19" />
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="8.1.4" />
2626
<PackageReference Include="Abp.AspNetCore" Version="8.4.0" />
2727
<PackageReference Include="Abp.ZeroCore" Version="8.4.0" />
2828
</ItemGroup>

backend/src/AcmStatisticsBackend.Web.Host/AcmStatisticsBackend.Web.Host.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net7.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<PreserveCompilationContext>true</PreserveCompilationContext>
55
<AssemblyName>AcmStatisticsBackend.Web.Host</AssemblyName>
66
<OutputType>Exe</OutputType>
@@ -31,11 +31,11 @@
3131
</ItemGroup>
3232
<ItemGroup>
3333
<PackageReference Include="Abp.Castle.Log4Net" Version="8.4.0" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.20">
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.19">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>
38-
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.21.0" />
38+
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.22.1" />
3939
</ItemGroup>
4040
<ItemGroup>
4141
<Folder Include="wwwroot\" />

backend/src/AcmStatisticsBackend.Web.Host/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
22

3-
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
44
WORKDIR /app
55
EXPOSE 80
66

7-
FROM mcr.microsoft.com/dotnet/sdk:7.0 AS build
7+
FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
88
WORKDIR /src
99
COPY ["src/AcmStatisticsBackend.Web.Host/AcmStatisticsBackend.Web.Host.csproj", "src/AcmStatisticsBackend.Web.Host/"]
1010
COPY ["src/AcmStatisticsBackend.Web.Core/AcmStatisticsBackend.Web.Core.csproj", "src/AcmStatisticsBackend.Web.Core/"]

backend/test/AcmStatisticsBackend.Tests/AcmStatisticsBackend.Tests.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<VersionPrefix>1.0.0.0</VersionPrefix>
4-
<TargetFramework>net7.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Tests</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Tests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -18,18 +18,18 @@
1818
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
21-
<PackageReference Include="FluentAssertions" Version="6.12.2" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.20" />
21+
<PackageReference Include="FluentAssertions" Version="8.5.0" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.19" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
24-
<PackageReference Include="NSubstitute" Version="4.3.0" />
25-
<PackageReference Include="xunit" Version="2.4.2" />
26-
<PackageReference Include="xunit.extensibility.execution" Version="2.4.2" />
27-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
24+
<PackageReference Include="NSubstitute" Version="5.3.0" />
25+
<PackageReference Include="xunit" Version="2.9.3" />
26+
<PackageReference Include="xunit.extensibility.execution" Version="2.9.3" />
27+
<PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3030
</PackageReference>
3131
<PackageReference Include="Abp.TestBase" Version="8.4.0" />
32-
<PackageReference Include="Castle.Core" Version="4.4.1" />
32+
<PackageReference Include="Castle.Core" Version="5.2.1" />
3333
</ItemGroup>
3434
<ItemGroup>
3535
<None Update="appsettings.json">

0 commit comments

Comments
 (0)