Browse Source
Merge pull request #12698 from abpframework/auto-merge/rel-5-3/1090
Merge branch dev with rel-5.3
pull/12737/head
maliming
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
3 additions and
4 deletions
-
modules/cms-kit/host/Volo.CmsKit.HttpApi.Host/Volo.CmsKit.HttpApi.Host.csproj
-
templates/module/aspnet-core/host/MyCompanyName.MyProjectName.OpenIddict/MyCompanyName.MyProjectName.OpenIddict.csproj
|
|
@ -15,7 +15,6 @@ |
|
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCorePackageVersion)" /> |
|
|
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="$(MicrosoftAspNetCorePackageVersion)" /> |
|
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftAspNetCorePackageVersion)" /> |
|
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="$(MicrosoftAspNetCorePackageVersion)" /> |
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" /> |
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="$(MicrosoftEntityFrameworkCorePackageVersion)" /> |
|
|
|
|
|
|
|
|
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" /> |
|
|
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" /> |
|
|
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" /> |
|
|
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" /> |
|
|
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" /> |
|
|
<ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy\Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj" /> |
|
|
|
|
|
@ -10,12 +10,12 @@ |
|
|
</PropertyGroup> |
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" /> |
|
|
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" /> |
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" /> |
|
|
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.1.1" /> |
|
|
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="3.1.1" /> |
|
|
<PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="3.1.1" /> |
|
|
<PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="3.1.1" /> |
|
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.0" /> |
|
|
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" /> |
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0"> |
|
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.5"> |
|
|
<PrivateAssets>all</PrivateAssets> |
|
|
<PrivateAssets>all</PrivateAssets> |
|
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> |
|
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets> |
|
|
</PackageReference> |
|
|
</PackageReference> |
|
|
|
