Skip to content

Commit

Permalink
Merge pull request #96 from jxnkwlp/feature/upgrade
Browse files Browse the repository at this point in the history
⬆️ update to .net8
  • Loading branch information
jxnkwlp committed Feb 7, 2024
2 parents 204702e + 4bf6277 commit 194f245
Show file tree
Hide file tree
Showing 42 changed files with 4,082 additions and 188 deletions.
6 changes: 4 additions & 2 deletions app/common.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
<Project>
<Project>
<PropertyGroup>
<LangVersion>latest</LangVersion>
<Version>1.0.0</Version>
<NoWarn>$(NoWarn);CS1591</NoWarn>
<AbpProjectType>app</AbpProjectType>
<AbpVersion>8.0.2</AbpVersion>
<ElsaVersion>2.14.1</ElsaVersion>
</PropertyGroup>

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

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.ObjectExtending" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="7.2.3" />
<PackageReference Include="Volo.Abp.ObjectExtending" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Account.Application.Contracts" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.Application.Contracts" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application.Contracts" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.Application.Contracts" Version="$(AbpVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Passingwind.WorkflowApp</RootNamespace>
</PropertyGroup>

Expand All @@ -14,12 +14,12 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.8" />
<PackageReference Include="Volo.Abp.Account.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="7.2.3" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.*" />
<PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Authentication.OpenIdConnect" Version="$(AbpVersion)" />
<FrameworkReference Include="Microsoft.AspNetCore.App" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,19 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
<PackageReference Include="Serilog.Extensions.Logging" Version="8.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="4.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.*" />
<PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Autofac" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<ProjectReference Include="..\Passingwind.WorkflowApp.Application.Contracts\Passingwind.WorkflowApp.Application.Contracts.csproj" />
<ProjectReference Include="..\Passingwind.WorkflowApp.EntityFrameworkCore\Passingwind.WorkflowApp.EntityFrameworkCore.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.Domain.Shared" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain.Shared" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain.Shared" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain.Shared" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain.Shared" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Shared" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain.Shared" Version="$(AbpVersion)" />
</ItemGroup>

<ItemGroup>
Expand All @@ -24,7 +24,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="7.0.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="8.0.*" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<RootNamespace>Passingwind.WorkflowApp</RootNamespace>
</PropertyGroup>

Expand All @@ -13,14 +13,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.Emailing" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="7.2.3" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="7.2.3" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="7.2.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Emailing" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.BackgroundJobs.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AuditLogging.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.FeatureManagement.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.Domain" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
</ItemGroup>

</Project>
Loading

0 comments on commit 194f245

Please sign in to comment.