Skip to content

Commit 5d6d491

Browse files
Liu233wLiu233w
authored
Merge pull request #2803 from Liu233w/renovate/major-dotnet-monorepo
chore(*): Update dotnet monorepo to v7 (major)
2 parents 8c61c11 + 32bd6aa commit 5d6d491

File tree

15 files changed

+41
-39
lines changed

15 files changed

+41
-39
lines changed

‎backend/.config/dotnet-tools.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"isRoot": true,
44
"tools": {
55
"dotnet-ef": {
6-
"version": "6.0.15",
6+
"version": "7.0.4",
77
"commands": [
88
"dotnet-ef"
99
]

‎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:6.0
1+
FROM mcr.microsoft.com/dotnet/sdk:7.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/src/AcmStatisticsBackend.Application/AcmStatisticsBackend.Application.csproj

Lines changed: 1 addition & 1 deletion
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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Application</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Application</PackageId>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

‎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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Core</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Core</PackageId>
77
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -14,8 +14,8 @@
1414
<EmbeddedResource Include="Localization\SourceFiles\*.xml" Exclude="bin\**;obj\**;**\*.xproj;packages\**;@(EmbeddedResource)" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<PackageReference Include="Abp.AutoMapper" Version="7.4.0" />
18-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="7.4.0" />
17+
<PackageReference Include="Abp.AutoMapper" Version="8.1.0" />
18+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="8.1.0" />
1919
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.4.0" />
2020
<PackageReference Include="Flurl.Http" Version="3.2.4" />
2121
</ItemGroup>

‎backend/src/AcmStatisticsBackend.Core/Authorization/Users/UserStore.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ public UserStore(
1818
IRepository<UserClaim, long> userClaimRepository,
1919
IRepository<UserPermissionSetting, long> userPermissionSettingRepository,
2020
IRepository<UserOrganizationUnit, long> userOrganizationUnitRepository,
21-
IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository)
21+
IRepository<OrganizationUnitRole, long> organizationUnitRoleRepository,
22+
IRepository<UserToken, long> userTokenRepository)
2223
: base(
2324
unitOfWorkManager,
2425
userRepository,
@@ -28,7 +29,8 @@ public UserStore(
2829
userClaimRepository,
2930
userPermissionSettingRepository,
3031
userOrganizationUnitRepository,
31-
organizationUnitRoleRepository)
32+
organizationUnitRoleRepository,
33+
userTokenRepository)
3234
{
3335
}
3436
}

‎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>net6.0</TargetFramework>
3+
<TargetFramework>net7.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="6.0.15">
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.4">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
14+
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="7.0.0" />
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: 4 additions & 4 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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Web.Core</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Web.Core</PackageId>
77
<GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
@@ -21,9 +21,9 @@
2121
<ProjectReference Include="..\AcmStatisticsBackend.EntityFrameworkCore\AcmStatisticsBackend.EntityFrameworkCore.csproj" />
2222
</ItemGroup>
2323
<ItemGroup>
24-
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="6.0.15" />
24+
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.4" />
2525
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
26-
<PackageReference Include="Abp.AspNetCore" Version="7.4.0" />
27-
<PackageReference Include="Abp.ZeroCore" Version="7.4.0" />
26+
<PackageReference Include="Abp.AspNetCore" Version="8.1.0" />
27+
<PackageReference Include="Abp.ZeroCore" Version="8.1.0" />
2828
</ItemGroup>
2929
</Project>

‎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>net6.0</TargetFramework>
3+
<TargetFramework>net7.0</TargetFramework>
44
<PreserveCompilationContext>true</PreserveCompilationContext>
55
<AssemblyName>AcmStatisticsBackend.Web.Host</AssemblyName>
66
<OutputType>Exe</OutputType>
@@ -30,8 +30,8 @@
3030
<ProjectReference Include="..\AcmStatisticsBackend.Web.Core\AcmStatisticsBackend.Web.Core.csproj" />
3131
</ItemGroup>
3232
<ItemGroup>
33-
<PackageReference Include="Abp.Castle.Log4Net" Version="7.4.0" />
34-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.15">
33+
<PackageReference Include="Abp.Castle.Log4Net" Version="8.1.0" />
34+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
3535
<PrivateAssets>all</PrivateAssets>
3636
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
3737
</PackageReference>

‎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:6.0 AS base
3+
FROM mcr.microsoft.com/dotnet/aspnet:7.0 AS base
44
WORKDIR /app
55
EXPOSE 80
66

7-
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
7+
FROM mcr.microsoft.com/dotnet/sdk:7.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: 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>net6.0</TargetFramework>
4+
<TargetFramework>net7.0</TargetFramework>
55
<AssemblyName>AcmStatisticsBackend.Tests</AssemblyName>
66
<PackageId>AcmStatisticsBackend.Tests</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -19,7 +19,7 @@
1919
<PrivateAssets>all</PrivateAssets>
2020
</PackageReference>
2121
<PackageReference Include="FluentAssertions" Version="6.10.0" />
22-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.15" />
22+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
2323
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
2424
<PackageReference Include="NSubstitute" Version="4.3.0" />
2525
<PackageReference Include="xunit" Version="2.4.2" />
@@ -28,7 +28,7 @@
2828
<PrivateAssets>all</PrivateAssets>
2929
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
3030
</PackageReference>
31-
<PackageReference Include="Abp.TestBase" Version="7.4.0" />
31+
<PackageReference Include="Abp.TestBase" Version="8.1.0" />
3232
<PackageReference Include="Castle.Core" Version="4.4.1" />
3333
</ItemGroup>
3434
<ItemGroup>

0 commit comments

Comments
 (0)