Skip to content

Commit

Permalink
Merge pull request #6 from ridicoulous/main
Browse files Browse the repository at this point in the history
update abp packages version to 8.1.1
  • Loading branch information
jxnkwlp committed May 5, 2024
2 parents 1398f6c + c45a196 commit b64b7a6
Show file tree
Hide file tree
Showing 50 changed files with 798 additions and 338 deletions.
4 changes: 4 additions & 0 deletions host/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
<IsPackable>false</IsPackable>
</PropertyGroup>

<PropertyGroup>
<AbpVersion>8.1.1</AbpVersion>
</PropertyGroup>

<Target Name="NoWarnOnRazorViewImportedTypeConflicts" BeforeTargets="RazorCoreCompile">
<PropertyGroup>
<NoWarn>$(NoWarn);0436</NoWarn>
Expand Down
4 changes: 2 additions & 2 deletions host/src/Sample.DbMigrator/Sample.DbMigrator.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
</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="Serilog.Sinks.Console" Version="5.0.1" />
<PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.*" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.*">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
4 changes: 2 additions & 2 deletions host/src/Sample.HttpApi.Host/Sample.HttpApi.Host.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<!--<PackageReference Include="Hangfire.Core" Version="1.8.2" />-->
<PackageReference Include="Hangfire.MemoryStorage" Version="1.7.0" />
<PackageReference Include="Hangfire.MemoryStorage" Version="1.8.0" />
<PackageReference Include="Volo.Abp.AspNetCore.MultiTenancy" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ await IdentitySecurityLogManager.SaveAsync(new IdentitySecurityLogContext()
UserName = user.Name
});

return RedirectSafely(returnUrl, returnUrlHash);
return await RedirectSafelyAsync(returnUrl, returnUrlHash);
}

protected virtual async Task<SignInResult> ExternalLoginSignInAsync(ExternalLoginInfo loginInfo)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using JetBrains.Annotations;
using Microsoft.AspNetCore.Mvc;
using Volo.Abp;
using Asp.Versioning;
using Volo.Abp.AspNetCore.Mvc;

namespace Passingwind.Abp.Account;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,19 @@
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Roslynator.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="Volo.Abp.AspNetCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.AspNetCore" Version="$(AbpVersion)" />
<PackageReference Include="Passingwind.AspNetCore.Authentication.ApiKey" Version="0.2.0" />
<PackageReference Include="Passingwind.AspNetCore.Authentication.ApiKey" Version="0.3.0" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Threading.Tasks;
using Asp.Versioning;
using Microsoft.AspNetCore.Mvc;
using Volo.Abp;
using Volo.Abp.Application.Dtos;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Volo.Abp.VirtualFileSystem" Version="7.2.3" />
<PackageReference Include="Volo.Abp.VirtualFileSystem" Version="8.1.1" />
</ItemGroup>

<ItemGroup>
Expand All @@ -21,4 +21,19 @@
</Content>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Roslynator.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
9 changes: 5 additions & 4 deletions modules/common.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
</PropertyGroup>

<PropertyGroup>
<AbpVersion>8.0.0</AbpVersion>
<AbpVersion>8.1.1</AbpVersion>
<RoslynatorVersion>4.11.0</RoslynatorVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(Configuration)'=='Release'">
Expand All @@ -45,15 +46,15 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Roslynator.Analyzers" Version="4.11.0">
<PackageReference Include="Roslynator.Analyzers" Version="$(RoslynatorVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="4.11.0">
<PackageReference Include="Roslynator.CodeAnalysis.Analyzers" Version="$(RoslynatorVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="4.11.0">
<PackageReference Include="Roslynator.Formatting.Analyzers" Version="$(RoslynatorVersion)">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Passingwind.Abp.DictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1">
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="7.2.3" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Account.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="7.2.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="7.2.3" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="7.2.3" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Account.Web.OpenIddict" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Account.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Account.HttpApi" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.HttpApi" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.OpenIddict.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.HttpApi" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Identity.HttpApi" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.Domain.Identity" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.FeatureManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.FeatureManagement.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.FeatureManagement.HttpApi" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.Application" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.HttpApi" Version="$(AbpVersion)" />
<ProjectReference Include="..\..\src\Passingwind.Abp.DictionaryManagement.Application.Contracts\Passingwind.Abp.DictionaryManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\Passingwind.Abp.DictionaryManagement.Host.Shared\Passingwind.Abp.DictionaryManagement.Host.Shared.csproj" />
</ItemGroup>
Expand All @@ -67,4 +67,19 @@
</None>
</ItemGroup>

<ItemGroup>
<PackageReference Update="Roslynator.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,19 @@
<RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
</PropertyGroup>

<ItemGroup>
<PackageReference Update="Roslynator.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
@@ -1,32 +1,35 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<Project Sdk="Microsoft.NET.Sdk.Web">

<Import Project="..\..\common.props" />

<PropertyGroup>
<TargetFramework>net7.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<Nullable>enable</Nullable>
<RootNamespace>Passingwind.Abp.DictionaryManagement</RootNamespace>
<PreserveCompilationReferences>true</PreserveCompilationReferences>
<UserSecretsId>Passingwind.Abp.DictionaryManagement-c2d31439-b723-48e2-b061-5ebd7aeb6010</UserSecretsId>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="IdentityModel" Version="6.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="7.0.0" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="7.0.1" />
<PackageReference Include="Volo.Abp.Autofac" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="7.2.3" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="7.2.3" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="7.2.3" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="7.2.3" />
<PackageReference Include="IdentityModel" Version="7.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.4" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="8.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.4">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Volo.Abp.Autofac" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Caching.StackExchangeRedis" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.EntityFrameworkCore.SqlServer" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AspNetCore.Serilog" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.Swashbuckle" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.PermissionManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.SettingManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.AuditLogging.EntityFrameworkCore" Version="$(AbpVersion)" />
<PackageReference Include="Volo.Abp.TenantManagement.EntityFrameworkCore" Version="$(AbpVersion)" />
</ItemGroup>

<ItemGroup>
Expand All @@ -43,4 +46,19 @@
<None Remove="Logs\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Roslynator.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.CodeAnalysis.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Update="Roslynator.Formatting.Analyzers" Version="4.12.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,7 @@
<ProjectReference Include="..\Passingwind.Abp.DictionaryManagement.Application.Contracts\Passingwind.Abp.DictionaryManagement.Application.Contracts.csproj" />
<ProjectReference Include="..\Passingwind.Abp.DictionaryManagement.Domain\Passingwind.Abp.DictionaryManagement.Domain.csproj" />
</ItemGroup>



</Project>
Loading

0 comments on commit b64b7a6

Please sign in to comment.