Skip to content

Commit 194f245

Browse files
jxnkwlpjxnkwlp
authored
Merge pull request #96 from jxnkwlp/feature/upgrade
⬆️ update to .net8
2 parents 204702e + 4bf6277 commit 194f245

File tree

42 files changed

+4082
-188
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+4082
-188
lines changed

‎app/common.props

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
<Project>
1+
<Project>
22
<PropertyGroup>
33
<LangVersion>latest</LangVersion>
44
<Version>1.0.0</Version>
55
<NoWarn>$(NoWarn);CS1591</NoWarn>
66
<AbpProjectType>app</AbpProjectType>
7+
<AbpVersion>8.0.2</AbpVersion>
8+
<ElsaVersion>2.14.1</ElsaVersion>
79
</PropertyGroup>
810

911
<Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
@@ -16,4 +18,4 @@
1618
<Content Remove="$(UserProfile)\.nuget\packages\*\*\contentFiles\any\*\*.abppkg*.json" />
1719
</ItemGroup>
1820

19-
</Project>
21+
</Project>

‎app/src/Passingwind.WorkflowApp.Application.Contracts/Passingwind.WorkflowApp.Application.Contracts.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
</ItemGroup>
1313

1414
<ItemGroup>
15-
<PackageReference Include="Volo.Abp.ObjectExtending" Version="7.2.3" />
16-
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.2.3" />
17-
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.2.3" />
18-
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.3" />
19-
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.3" />
15+
<PackageReference Include="Volo.Abp.ObjectExtending" Version="$(AbpVersion)" />
16+
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(AbpVersion)" />
17+
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
18+
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="$(AbpVersion)" />
19+
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="$(AbpVersion)" />
2020
</ItemGroup>
2121

2222
</Project>

‎app/src/Passingwind.WorkflowApp.Application/Passingwind.WorkflowApp.Application.csproj

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<RootNamespace>Passingwind.WorkflowApp</RootNamespace>
88
</PropertyGroup>
99

@@ -14,12 +14,12 @@
1414
</ItemGroup>
1515

1616
<ItemGroup>
17-
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.8" />
18-
<PackageReference Include="Volo.Abp.Account.Application" Version="7.2.3" />
19-
<PackageReference Include="Volo.Abp.Identity.Application" Version="7.2.3" />
20-
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.2.3" />
21-
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.2.3" />
22-
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="7.2.3" />
17+
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.*" />
18+
<PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
19+
<PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
20+
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
21+
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="$(AbpVersion)" />
22+
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="$(AbpVersion)" />
2323
<FrameworkReference Include="Microsoft.AspNetCore.App" />
2424
</ItemGroup>
2525

‎app/src/Passingwind.WorkflowApp.DbMigrator/Passingwind.WorkflowApp.DbMigrator.csproj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@
44

55
<PropertyGroup>
66
<OutputType>Exe</OutputType>
7-
<TargetFramework>net7.0</TargetFramework>
7+
<TargetFramework>net8.0</TargetFramework>
88
</PropertyGroup>
99

1010
<ItemGroup>
11-
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
11+
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
1212
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
1313
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
14-
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
15-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.*" />
14+
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
15+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Volo.Abp.Autofac" Version="7.2.3" />
19+
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
2020
<ProjectReference Include="..\Passingwind.WorkflowApp.Application.Contracts\Passingwind.WorkflowApp.Application.Contracts.csproj" />
2121
<ProjectReference Include="..\Passingwind.WorkflowApp.EntityFrameworkCore\Passingwind.WorkflowApp.EntityFrameworkCore.csproj" />
2222
</ItemGroup>

‎app/src/Passingwind.WorkflowApp.Domain.Shared/Passingwind.WorkflowApp.Domain.Shared.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@
99
</PropertyGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.2.3" />
13-
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.3" />
14-
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.3" />
15-
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.3" />
16-
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.3" />
17-
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.3" />
18-
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.3" />
12+
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(AbpVersion)" />
13+
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(AbpVersion)" />
14+
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="$(AbpVersion)" />
15+
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="$(AbpVersion)" />
16+
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="$(AbpVersion)" />
17+
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="$(AbpVersion)" />
18+
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="$(AbpVersion)" />
1919
</ItemGroup>
2020

2121
<ItemGroup>
@@ -24,7 +24,7 @@
2424
</ItemGroup>
2525

2626
<ItemGroup>
27-
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.*" />
27+
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
2828
</ItemGroup>
2929

3030
</Project>

‎app/src/Passingwind.WorkflowApp.Domain/Passingwind.WorkflowApp.Domain.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Import Project="..\..\common.props" />
44

55
<PropertyGroup>
6-
<TargetFramework>net7.0</TargetFramework>
6+
<TargetFramework>net8.0</TargetFramework>
77
<RootNamespace>Passingwind.WorkflowApp</RootNamespace>
88
</PropertyGroup>
99

@@ -13,14 +13,14 @@
1313
</ItemGroup>
1414

1515
<ItemGroup>
16-
<PackageReference Include="Volo.Abp.Emailing" Version="7.2.3" />
17-
<PackageReference Include="Volo.Abp.Identity.Domain" Version="7.2.3" />
18-
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.2.3" />
19-
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.2.3" />
20-
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.2.3" />
21-
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.2.3" />
22-
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.2.3" />
23-
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.3" />
16+
<PackageReference Include="Volo.Abp.Emailing" Version="$(AbpVersion)" />
17+
<PackageReference Include="Volo.Abp.Identity.Domain" Version="$(AbpVersion)" />
18+
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="$(AbpVersion)" />
19+
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="$(AbpVersion)" />
20+
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="$(AbpVersion)" />
21+
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="$(AbpVersion)" />
22+
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="$(AbpVersion)" />
23+
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
2424
</ItemGroup>
2525

2626
</Project>

0 commit comments

Comments
 (0)