Browse Source

Merge pull request #5700 from abpframework/maliming/net5

Upgrade to NET 5.0 RC.
pull/5827/head
Halil İbrahim Kalkan 6 years ago
committed by GitHub
parent
commit
37f7813bd8
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/build-and-test.yml
  2. 7
      NuGet.Config
  3. 4
      build/common.ps1
  4. 4
      framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj
  5. 2
      framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj
  6. 4
      framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj
  7. 3
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj
  8. 3
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj
  9. 7
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs
  10. 6
      framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj
  11. 2
      framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
  12. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
  13. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj
  14. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj
  15. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
  16. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj
  17. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj
  18. 4
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj
  19. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
  20. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj
  21. 2
      framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
  22. 6
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
  23. 3
      framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs
  24. 2
      framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj
  25. 2
      framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj
  26. 4
      framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj
  27. 2
      framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj
  28. 758
      framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AbpAspNetCoreContentOptions.cs
  29. 2
      framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj
  30. 2
      framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj
  31. 2
      framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj
  32. 2
      framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.csproj
  33. 2
      framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.csproj
  34. 7
      framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
  35. 2
      framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.csproj
  36. 2
      framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj
  37. 4
      framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj
  38. 2
      framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj
  39. 2
      framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj
  40. 8
      framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
  41. 14
      framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs
  42. 18
      framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
  43. 2
      framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj
  44. 6
      framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj
  45. 26
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs
  46. 2
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
  47. 52
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs
  48. 64
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs
  49. 44
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs
  50. 2
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
  51. 50
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleExtensions.cs
  52. 60
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleExtensions.cs
  53. 44
      framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs
  54. 4
      framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
  55. 4
      framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj
  56. 4
      framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj
  57. 6
      framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj
  58. 15
      framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DatabaseFacadeExtensions.cs
  59. 2
      framework/src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.csproj
  60. 2
      framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj
  61. 2
      framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj
  62. 6
      framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj
  63. 4
      framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.csproj
  64. 2
      framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj
  65. 2
      framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj
  66. 4
      framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj
  67. 4
      framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj
  68. 4
      framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj
  69. 20
      framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs
  70. 4
      framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj
  71. 2
      framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj
  72. 126
      framework/src/Volo.Abp.Serialization/Volo/Abp/Serialization/Binary/BinarySerializationHelper.cs
  73. 8
      framework/src/Volo.Abp.Serialization/Volo/Abp/Serialization/DefaultObjectSerializer.cs
  74. 2
      framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.csproj
  75. 2
      framework/src/Volo.Abp.UI/Volo.Abp.UI.csproj
  76. 2
      framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.csproj
  77. 6
      framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj
  78. 2
      framework/test/AbpTestBase/AbpTestBase.csproj
  79. 4
      framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj
  80. 2
      framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj
  81. 4
      framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj
  82. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj
  83. 15
      framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs
  84. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj
  85. 6
      framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj
  86. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj
  87. 4
      framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj
  88. 2
      framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj
  89. 4
      framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj
  90. 2
      framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj
  91. 4
      framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj
  92. 6
      framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj
  93. 2
      framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj
  94. 2
      framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj
  95. 4
      framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj
  96. 2
      framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj
  97. 4
      framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj
  98. 4
      framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj
  99. 2
      framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj
  100. 2
      framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj

2
.github/workflows/build-and-test.yml

@ -17,7 +17,7 @@ jobs:
- uses: actions/checkout@v2 - uses: actions/checkout@v2
- uses: actions/setup-dotnet@master - uses: actions/setup-dotnet@master
with: with:
dotnet-version: 3.1.102 dotnet-version: 5.0.100-rc.2.20479.15
- name: Build All - name: Build All
run: .\build-all.ps1 run: .\build-all.ps1

7
NuGet.Config

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
<add key="BlazoriseMyGet" value="https://www.myget.org/F/blazorise/api/v3/index.json" />
</packageSources>
</configuration>

4
build/common.ps1

@ -16,7 +16,9 @@ $solutionPaths = @(
"../modules/tenant-management", "../modules/tenant-management",
"../modules/audit-logging", "../modules/audit-logging",
"../modules/background-jobs", "../modules/background-jobs",
"../modules/account" "../modules/account",
"../modules/cms-kit",
"../modules/blob-storing-database"
) )
if ($full -eq "-f") if ($full -eq "-f")

4
framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Authentication.JwtBearer</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Authentication.JwtBearer</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Authentication.JwtBearer</PackageId> <PackageId>Volo.Abp.AspNetCore.Authentication.JwtBearer</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Authentication.OAuth</PackageId> <PackageId>Volo.Abp.AspNetCore.Authentication.OAuth</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

4
framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj

@ -4,12 +4,12 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

3
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme/Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj

@ -4,8 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
<PackageId>Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme</PackageId> <PackageId>Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme</PackageId>
</PropertyGroup> </PropertyGroup>

3
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj

@ -4,8 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

7
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Microsoft/AspNetCore/Components/WebAssembly/Hosting/AbpWebAssemblyHostBuilderExtensions.cs

@ -1,6 +1,7 @@
using System; using System;
using System.Globalization; using System.Globalization;
using System.Reflection; using System.Reflection;
using System.Runtime.CompilerServices;
using System.Threading.Tasks; using System.Threading.Tasks;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
@ -21,6 +22,12 @@ namespace Microsoft.AspNetCore.Components.WebAssembly.Hosting
{ {
Check.NotNull(builder, nameof(builder)); Check.NotNull(builder, nameof(builder));
// Related this commit(https://github.com/dotnet/aspnetcore/commit/b99d805bc037fcac56afb79abeb7d5a43141c85e)
// Microsoft.AspNetCore.Blazor.BuildTools has been removed in net 5.0.
// This call may be removed when we find a suitable solution.
// System.Runtime.CompilerServices.AsyncStateMachineAttribute
Castle.DynamicProxy.Generators.AttributesToAvoidReplicating.Add<AsyncStateMachineAttribute>();
builder.Services.AddSingleton<IConfiguration>(builder.Configuration); builder.Services.AddSingleton<IConfiguration>(builder.Configuration);
builder.Services.AddSingleton(builder); builder.Services.AddSingleton(builder);

6
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Components.WebAssembly</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Components.WebAssembly</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Components.WebAssembly</PackageId> <PackageId>Volo.Abp.AspNetCore.Components.WebAssembly</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.Components.Authorization" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" /> <PackageReference Include="Microsoft.AspNetCore.WebUtilities" Version="2.2.0" />
</ItemGroup> </ItemGroup>

2
framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.MultiTenancy</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.MultiTenancy</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.MultiTenancy</PackageId> <PackageId>Volo.Abp.AspNetCore.MultiTenancy</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

2
framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Client</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.Client</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.Client</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.Client</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

4
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</PackageId>
@ -12,7 +12,7 @@
<IsPackable>true</IsPackable> <IsPackable>true</IsPackable>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI\Volo.Abp.AspNetCore.Mvc.UI.csproj" /> <ProjectReference Include="..\Volo.Abp.AspNetCore.Mvc.UI\Volo.Abp.AspNetCore.Mvc.UI.csproj" />
</ItemGroup> </ItemGroup>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</PackageId>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Packages</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Packages</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Packages</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Packages</PackageId>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic</PackageId>

4
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</PackageId>
@ -26,7 +26,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</PackageId>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Widgets</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Widgets</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Widgets</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Widgets</PackageId>

2
framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI</PackageId>

6
framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
<AssemblyName>Volo.Abp.AspNetCore.Mvc</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc</PackageId>
@ -27,9 +27,9 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.Versioning" Version="4.1.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

3
framework/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/ModelBinding/AbpDateTimeModelBinderProvider.cs

@ -6,6 +6,7 @@ using Volo.Abp.Timing;
namespace Volo.Abp.AspNetCore.Mvc.ModelBinding namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
{ {
public class AbpDateTimeModelBinderProvider : IModelBinderProvider public class AbpDateTimeModelBinderProvider : IModelBinderProvider
{ {
public IModelBinder GetBinder(ModelBinderProviderContext context) public IModelBinder GetBinder(ModelBinderProviderContext context)
@ -44,4 +45,4 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
return null; return null;
} }
} }
} }

2
framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Serilog</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Serilog</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Serilog</PackageId> <PackageId>Volo.Abp.AspNetCore.Serilog</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

2
framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.SignalR</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.SignalR</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.SignalR</PackageId> <PackageId>Volo.Abp.AspNetCore.SignalR</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

4
framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.TestBase</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.TestBase</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.TestBase</PackageId> <PackageId>Volo.Abp.AspNetCore.TestBase</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -24,7 +24,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore</AssemblyName>
<PackageId>Volo.Abp.AspNetCore</PackageId> <PackageId>Volo.Abp.AspNetCore</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

758
framework/src/Volo.Abp.AspNetCore/Volo/Abp/AspNetCore/VirtualFileSystem/AbpAspNetCoreContentOptions.cs

@ -16,384 +16,386 @@ namespace Volo.Abp.AspNetCore.VirtualFileSystem
{ {
ContentTypeMaps = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase) ContentTypeMaps = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase)
{ {
{".323", "text/h323"}, { ".323", "text/h323" },
{".3g2", "video/3gpp2"}, { ".3g2", "video/3gpp2" },
{".3gp2", "video/3gpp2"}, { ".3gp2", "video/3gpp2" },
{".3gp", "video/3gpp"}, { ".3gp", "video/3gpp" },
{".3gpp", "video/3gpp"}, { ".3gpp", "video/3gpp" },
{".aac", "audio/aac"}, { ".aac", "audio/aac" },
{".aaf", "application/octet-stream"}, { ".aaf", "application/octet-stream" },
{".aca", "application/octet-stream"}, { ".aca", "application/octet-stream" },
{".accdb", "application/msaccess"}, { ".accdb", "application/msaccess" },
{".accde", "application/msaccess"}, { ".accde", "application/msaccess" },
{".accdt", "application/msaccess"}, { ".accdt", "application/msaccess" },
{".acx", "application/internet-property-stream"}, { ".acx", "application/internet-property-stream" },
{".adt", "audio/vnd.dlna.adts"}, { ".adt", "audio/vnd.dlna.adts" },
{".adts", "audio/vnd.dlna.adts"}, { ".adts", "audio/vnd.dlna.adts" },
{".afm", "application/octet-stream"}, { ".afm", "application/octet-stream" },
{".ai", "application/postscript"}, { ".ai", "application/postscript" },
{".aif", "audio/x-aiff"}, { ".aif", "audio/x-aiff" },
{".aifc", "audio/aiff"}, { ".aifc", "audio/aiff" },
{".aiff", "audio/aiff"}, { ".aiff", "audio/aiff" },
{".appcache", "text/cache-manifest"}, { ".appcache", "text/cache-manifest" },
{".application", "application/x-ms-application"}, { ".application", "application/x-ms-application" },
{".art", "image/x-jg"}, { ".art", "image/x-jg" },
{".asd", "application/octet-stream"}, { ".asd", "application/octet-stream" },
{".asf", "video/x-ms-asf"}, { ".asf", "video/x-ms-asf" },
{".asi", "application/octet-stream"}, { ".asi", "application/octet-stream" },
{".asm", "text/plain"}, { ".asm", "text/plain" },
{".asr", "video/x-ms-asf"}, { ".asr", "video/x-ms-asf" },
{".asx", "video/x-ms-asf"}, { ".asx", "video/x-ms-asf" },
{".atom", "application/atom+xml"}, { ".atom", "application/atom+xml" },
{".au", "audio/basic"}, { ".au", "audio/basic" },
{".avi", "video/x-msvideo"}, { ".avi", "video/x-msvideo" },
{".axs", "application/olescript"}, { ".axs", "application/olescript" },
{".bas", "text/plain"}, { ".bas", "text/plain" },
{".bcpio", "application/x-bcpio"}, { ".bcpio", "application/x-bcpio" },
{".bin", "application/octet-stream"}, { ".bin", "application/octet-stream" },
{".bmp", "image/bmp"}, { ".bmp", "image/bmp" },
{".c", "text/plain"}, { ".c", "text/plain" },
{".cab", "application/vnd.ms-cab-compressed"}, { ".cab", "application/vnd.ms-cab-compressed" },
{".calx", "application/vnd.ms-office.calx"}, { ".calx", "application/vnd.ms-office.calx" },
{".cat", "application/vnd.ms-pki.seccat"}, { ".cat", "application/vnd.ms-pki.seccat" },
{".cdf", "application/x-cdf"}, { ".cdf", "application/x-cdf" },
{".chm", "application/octet-stream"}, { ".chm", "application/octet-stream" },
{".class", "application/x-java-applet"}, { ".class", "application/x-java-applet" },
{".clp", "application/x-msclip"}, { ".clp", "application/x-msclip" },
{".cmx", "image/x-cmx"}, { ".cmx", "image/x-cmx" },
{".cnf", "text/plain"}, { ".cnf", "text/plain" },
{".cod", "image/cis-cod"}, { ".cod", "image/cis-cod" },
{".cpio", "application/x-cpio"}, { ".cpio", "application/x-cpio" },
{".cpp", "text/plain"}, { ".cpp", "text/plain" },
{".crd", "application/x-mscardfile"}, { ".crd", "application/x-mscardfile" },
{".crl", "application/pkix-crl"}, { ".crl", "application/pkix-crl" },
{".crt", "application/x-x509-ca-cert"}, { ".crt", "application/x-x509-ca-cert" },
{".csh", "application/x-csh"}, { ".csh", "application/x-csh" },
{".css", "text/css"}, { ".css", "text/css" },
{".csv", "application/octet-stream"}, { ".csv", "text/csv" }, // https://tools.ietf.org/html/rfc7111#section-5.1
{".cur", "application/octet-stream"}, { ".cur", "application/octet-stream" },
{".dcr", "application/x-director"}, { ".dcr", "application/x-director" },
{".deploy", "application/octet-stream"}, { ".deploy", "application/octet-stream" },
{".der", "application/x-x509-ca-cert"}, { ".der", "application/x-x509-ca-cert" },
{".dib", "image/bmp"}, { ".dib", "image/bmp" },
{".dir", "application/x-director"}, { ".dir", "application/x-director" },
{".disco", "text/xml"}, { ".disco", "text/xml" },
{".dlm", "text/dlm"}, { ".dlm", "text/dlm" },
{".doc", "application/msword"}, { ".doc", "application/msword" },
{".docm", "application/vnd.ms-word.document.macroEnabled.12"}, { ".docm", "application/vnd.ms-word.document.macroEnabled.12" },
{".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document"}, { ".docx", "application/vnd.openxmlformats-officedocument.wordprocessingml.document" },
{".dot", "application/msword"}, { ".dot", "application/msword" },
{".dotm", "application/vnd.ms-word.template.macroEnabled.12"}, { ".dotm", "application/vnd.ms-word.template.macroEnabled.12" },
{".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template"}, { ".dotx", "application/vnd.openxmlformats-officedocument.wordprocessingml.template" },
{".dsp", "application/octet-stream"}, { ".dsp", "application/octet-stream" },
{".dtd", "text/xml"}, { ".dtd", "text/xml" },
{".dvi", "application/x-dvi"}, { ".dvi", "application/x-dvi" },
{".dvr-ms", "video/x-ms-dvr"}, { ".dvr-ms", "video/x-ms-dvr" },
{".dwf", "drawing/x-dwf"}, { ".dwf", "drawing/x-dwf" },
{".dwp", "application/octet-stream"}, { ".dwp", "application/octet-stream" },
{".dxr", "application/x-director"}, { ".dxr", "application/x-director" },
{".eml", "message/rfc822"}, { ".eml", "message/rfc822" },
{".emz", "application/octet-stream"}, { ".emz", "application/octet-stream" },
{".eot", "application/vnd.ms-fontobject"}, { ".eot", "application/vnd.ms-fontobject" },
{".eps", "application/postscript"}, { ".eps", "application/postscript" },
{".etx", "text/x-setext"}, { ".etx", "text/x-setext" },
{".evy", "application/envoy"}, { ".evy", "application/envoy" },
{".fdf", "application/vnd.fdf"}, { ".exe", "application/vnd.microsoft.portable-executable" }, // https://www.iana.org/assignments/media-types/application/vnd.microsoft.portable-executable
{".fif", "application/fractals"}, { ".fdf", "application/vnd.fdf" },
{".fla", "application/octet-stream"}, { ".fif", "application/fractals" },
{".flr", "x-world/x-vrml"}, { ".fla", "application/octet-stream" },
{".flv", "video/x-flv"}, { ".flr", "x-world/x-vrml" },
{".gif", "image/gif"}, { ".flv", "video/x-flv" },
{".gtar", "application/x-gtar"}, { ".gif", "image/gif" },
{".gz", "application/x-gzip"}, { ".gtar", "application/x-gtar" },
{".h", "text/plain"}, { ".gz", "application/x-gzip" },
{".hdf", "application/x-hdf"}, { ".h", "text/plain" },
{".hdml", "text/x-hdml"}, { ".hdf", "application/x-hdf" },
{".hhc", "application/x-oleobject"}, { ".hdml", "text/x-hdml" },
{".hhk", "application/octet-stream"}, { ".hhc", "application/x-oleobject" },
{".hhp", "application/octet-stream"}, { ".hhk", "application/octet-stream" },
{".hlp", "application/winhlp"}, { ".hhp", "application/octet-stream" },
{".hqx", "application/mac-binhex40"}, { ".hlp", "application/winhlp" },
{".hta", "application/hta"}, { ".hqx", "application/mac-binhex40" },
{".htc", "text/x-component"}, { ".hta", "application/hta" },
{".htm", "text/html"}, { ".htc", "text/x-component" },
{".html", "text/html"}, { ".htm", "text/html" },
{".htt", "text/webviewhtml"}, { ".html", "text/html" },
{".hxt", "text/html"}, { ".htt", "text/webviewhtml" },
{".ical", "text/calendar"}, { ".hxt", "text/html" },
{".icalendar", "text/calendar"}, { ".ical", "text/calendar" },
{".ico", "image/x-icon"}, { ".icalendar", "text/calendar" },
{".ics", "text/calendar"}, { ".ico", "image/x-icon" },
{".ief", "image/ief"}, { ".ics", "text/calendar" },
{".ifb", "text/calendar"}, { ".ief", "image/ief" },
{".iii", "application/x-iphone"}, { ".ifb", "text/calendar" },
{".inf", "application/octet-stream"}, { ".iii", "application/x-iphone" },
{".ins", "application/x-internet-signup"}, { ".inf", "application/octet-stream" },
{".isp", "application/x-internet-signup"}, { ".ins", "application/x-internet-signup" },
{".IVF", "video/x-ivf"}, { ".isp", "application/x-internet-signup" },
{".jar", "application/java-archive"}, { ".IVF", "video/x-ivf" },
{".java", "application/octet-stream"}, { ".jar", "application/java-archive" },
{".jck", "application/liquidmotion"}, { ".java", "application/octet-stream" },
{".jcz", "application/liquidmotion"}, { ".jck", "application/liquidmotion" },
{".jfif", "image/pjpeg"}, { ".jcz", "application/liquidmotion" },
{".jpb", "application/octet-stream"}, { ".jfif", "image/pjpeg" },
{".jpe", "image/jpeg"}, { ".jpb", "application/octet-stream" },
{".jpeg", "image/jpeg"}, { ".jpe", "image/jpeg" },
{".jpg", "image/jpeg"}, { ".jpeg", "image/jpeg" },
{".js", "application/javascript"}, { ".jpg", "image/jpeg" },
{".json", "application/json"}, { ".js", "application/javascript" },
{".jsx", "text/jscript"}, { ".json", "application/json" },
{".latex", "application/x-latex"}, { ".jsx", "text/jscript" },
{".lit", "application/x-ms-reader"}, { ".latex", "application/x-latex" },
{".lpk", "application/octet-stream"}, { ".lit", "application/x-ms-reader" },
{".lsf", "video/x-la-asf"}, { ".lpk", "application/octet-stream" },
{".lsx", "video/x-la-asf"}, { ".lsf", "video/x-la-asf" },
{".lzh", "application/octet-stream"}, { ".lsx", "video/x-la-asf" },
{".m13", "application/x-msmediaview"}, { ".lzh", "application/octet-stream" },
{".m14", "application/x-msmediaview"}, { ".m13", "application/x-msmediaview" },
{".m1v", "video/mpeg"}, { ".m14", "application/x-msmediaview" },
{".m2ts", "video/vnd.dlna.mpeg-tts"}, { ".m1v", "video/mpeg" },
{".m3u", "audio/x-mpegurl"}, { ".m2ts", "video/vnd.dlna.mpeg-tts" },
{".m4a", "audio/mp4"}, { ".m3u", "audio/x-mpegurl" },
{".m4v", "video/mp4"}, { ".m4a", "audio/mp4" },
{".man", "application/x-troff-man"}, { ".m4v", "video/mp4" },
{".manifest", "application/x-ms-manifest"}, { ".man", "application/x-troff-man" },
{".map", "text/plain"}, { ".manifest", "application/x-ms-manifest" },
{".markdown", "text/markdown"}, { ".map", "text/plain" },
{".md", "text/markdown"}, { ".markdown", "text/markdown" },
{".mdb", "application/x-msaccess"}, { ".md", "text/markdown" },
{".mdp", "application/octet-stream"}, { ".mdb", "application/x-msaccess" },
{".me", "application/x-troff-me"}, { ".mdp", "application/octet-stream" },
{".mht", "message/rfc822"}, { ".me", "application/x-troff-me" },
{".mhtml", "message/rfc822"}, { ".mht", "message/rfc822" },
{".mid", "audio/mid"}, { ".mhtml", "message/rfc822" },
{".midi", "audio/mid"}, { ".mid", "audio/mid" },
{".mix", "application/octet-stream"}, { ".midi", "audio/mid" },
{".mmf", "application/x-smaf"}, { ".mix", "application/octet-stream" },
{".mno", "text/xml"}, { ".mmf", "application/x-smaf" },
{".mny", "application/x-msmoney"}, { ".mno", "text/xml" },
{".mov", "video/quicktime"}, { ".mny", "application/x-msmoney" },
{".movie", "video/x-sgi-movie"}, { ".mov", "video/quicktime" },
{".mp2", "video/mpeg"}, { ".movie", "video/x-sgi-movie" },
{".mp3", "audio/mpeg"}, { ".mp2", "video/mpeg" },
{".mp4", "video/mp4"}, { ".mp3", "audio/mpeg" },
{".mp4v", "video/mp4"}, { ".mp4", "video/mp4" },
{".mpa", "video/mpeg"}, { ".mp4v", "video/mp4" },
{".mpe", "video/mpeg"}, { ".mpa", "video/mpeg" },
{".mpeg", "video/mpeg"}, { ".mpe", "video/mpeg" },
{".mpg", "video/mpeg"}, { ".mpeg", "video/mpeg" },
{".mpp", "application/vnd.ms-project"}, { ".mpg", "video/mpeg" },
{".mpv2", "video/mpeg"}, { ".mpp", "application/vnd.ms-project" },
{".ms", "application/x-troff-ms"}, { ".mpv2", "video/mpeg" },
{".msi", "application/octet-stream"}, { ".ms", "application/x-troff-ms" },
{".mso", "application/octet-stream"}, { ".msi", "application/octet-stream" },
{".mvb", "application/x-msmediaview"}, { ".mso", "application/octet-stream" },
{".mvc", "application/x-miva-compiled"}, { ".mvb", "application/x-msmediaview" },
{".nc", "application/x-netcdf"}, { ".mvc", "application/x-miva-compiled" },
{".nsc", "video/x-ms-asf"}, { ".nc", "application/x-netcdf" },
{".nws", "message/rfc822"}, { ".nsc", "video/x-ms-asf" },
{".ocx", "application/octet-stream"}, { ".nws", "message/rfc822" },
{".oda", "application/oda"}, { ".ocx", "application/octet-stream" },
{".odc", "text/x-ms-odc"}, { ".oda", "application/oda" },
{".ods", "application/oleobject"}, { ".odc", "text/x-ms-odc" },
{".oga", "audio/ogg"}, { ".ods", "application/oleobject" },
{".ogg", "video/ogg"}, { ".oga", "audio/ogg" },
{".ogv", "video/ogg"}, { ".ogg", "video/ogg" },
{".ogx", "application/ogg"}, { ".ogv", "video/ogg" },
{".one", "application/onenote"}, { ".ogx", "application/ogg" },
{".onea", "application/onenote"}, { ".one", "application/onenote" },
{".onetoc", "application/onenote"}, { ".onea", "application/onenote" },
{".onetoc2", "application/onenote"}, { ".onetoc", "application/onenote" },
{".onetmp", "application/onenote"}, { ".onetoc2", "application/onenote" },
{".onepkg", "application/onenote"}, { ".onetmp", "application/onenote" },
{".osdx", "application/opensearchdescription+xml"}, { ".onepkg", "application/onenote" },
{".otf", "font/otf"}, { ".osdx", "application/opensearchdescription+xml" },
{".p10", "application/pkcs10"}, { ".otf", "font/otf" },
{".p12", "application/x-pkcs12"}, { ".p10", "application/pkcs10" },
{".p7b", "application/x-pkcs7-certificates"}, { ".p12", "application/x-pkcs12" },
{".p7c", "application/pkcs7-mime"}, { ".p7b", "application/x-pkcs7-certificates" },
{".p7m", "application/pkcs7-mime"}, { ".p7c", "application/pkcs7-mime" },
{".p7r", "application/x-pkcs7-certreqresp"}, { ".p7m", "application/pkcs7-mime" },
{".p7s", "application/pkcs7-signature"}, { ".p7r", "application/x-pkcs7-certreqresp" },
{".pbm", "image/x-portable-bitmap"}, { ".p7s", "application/pkcs7-signature" },
{".pcx", "application/octet-stream"}, { ".pbm", "image/x-portable-bitmap" },
{".pcz", "application/octet-stream"}, { ".pcx", "application/octet-stream" },
{".pdf", "application/pdf"}, { ".pcz", "application/octet-stream" },
{".pfb", "application/octet-stream"}, { ".pdf", "application/pdf" },
{".pfm", "application/octet-stream"}, { ".pfb", "application/octet-stream" },
{".pfx", "application/x-pkcs12"}, { ".pfm", "application/octet-stream" },
{".pgm", "image/x-portable-graymap"}, { ".pfx", "application/x-pkcs12" },
{".pko", "application/vnd.ms-pki.pko"}, { ".pgm", "image/x-portable-graymap" },
{".pma", "application/x-perfmon"}, { ".pko", "application/vnd.ms-pki.pko" },
{".pmc", "application/x-perfmon"}, { ".pma", "application/x-perfmon" },
{".pml", "application/x-perfmon"}, { ".pmc", "application/x-perfmon" },
{".pmr", "application/x-perfmon"}, { ".pml", "application/x-perfmon" },
{".pmw", "application/x-perfmon"}, { ".pmr", "application/x-perfmon" },
{".png", "image/png"}, { ".pmw", "application/x-perfmon" },
{".pnm", "image/x-portable-anymap"}, { ".png", "image/png" },
{".pnz", "image/png"}, { ".pnm", "image/x-portable-anymap" },
{".pot", "application/vnd.ms-powerpoint"}, { ".pnz", "image/png" },
{".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12"}, { ".pot", "application/vnd.ms-powerpoint" },
{".potx", "application/vnd.openxmlformats-officedocument.presentationml.template"}, { ".potm", "application/vnd.ms-powerpoint.template.macroEnabled.12" },
{".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12"}, { ".potx", "application/vnd.openxmlformats-officedocument.presentationml.template" },
{".ppm", "image/x-portable-pixmap"}, { ".ppam", "application/vnd.ms-powerpoint.addin.macroEnabled.12" },
{".pps", "application/vnd.ms-powerpoint"}, { ".ppm", "image/x-portable-pixmap" },
{".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12"}, { ".pps", "application/vnd.ms-powerpoint" },
{".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow"}, { ".ppsm", "application/vnd.ms-powerpoint.slideshow.macroEnabled.12" },
{".ppt", "application/vnd.ms-powerpoint"}, { ".ppsx", "application/vnd.openxmlformats-officedocument.presentationml.slideshow" },
{".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12"}, { ".ppt", "application/vnd.ms-powerpoint" },
{".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation"}, { ".pptm", "application/vnd.ms-powerpoint.presentation.macroEnabled.12" },
{".prf", "application/pics-rules"}, { ".pptx", "application/vnd.openxmlformats-officedocument.presentationml.presentation" },
{".prm", "application/octet-stream"}, { ".prf", "application/pics-rules" },
{".prx", "application/octet-stream"}, { ".prm", "application/octet-stream" },
{".ps", "application/postscript"}, { ".prx", "application/octet-stream" },
{".psd", "application/octet-stream"}, { ".ps", "application/postscript" },
{".psm", "application/octet-stream"}, { ".psd", "application/octet-stream" },
{".psp", "application/octet-stream"}, { ".psm", "application/octet-stream" },
{".pub", "application/x-mspublisher"}, { ".psp", "application/octet-stream" },
{".qt", "video/quicktime"}, { ".pub", "application/x-mspublisher" },
{".qtl", "application/x-quicktimeplayer"}, { ".qt", "video/quicktime" },
{".qxd", "application/octet-stream"}, { ".qtl", "application/x-quicktimeplayer" },
{".ra", "audio/x-pn-realaudio"}, { ".qxd", "application/octet-stream" },
{".ram", "audio/x-pn-realaudio"}, { ".ra", "audio/x-pn-realaudio" },
{".rar", "application/octet-stream"}, { ".ram", "audio/x-pn-realaudio" },
{".ras", "image/x-cmu-raster"}, { ".rar", "application/octet-stream" },
{".rf", "image/vnd.rn-realflash"}, { ".ras", "image/x-cmu-raster" },
{".rgb", "image/x-rgb"}, { ".rf", "image/vnd.rn-realflash" },
{".rm", "application/vnd.rn-realmedia"}, { ".rgb", "image/x-rgb" },
{".rmi", "audio/mid"}, { ".rm", "application/vnd.rn-realmedia" },
{".roff", "application/x-troff"}, { ".rmi", "audio/mid" },
{".rpm", "audio/x-pn-realaudio-plugin"}, { ".roff", "application/x-troff" },
{".rtf", "application/rtf"}, { ".rpm", "audio/x-pn-realaudio-plugin" },
{".rtx", "text/richtext"}, { ".rtf", "application/rtf" },
{".scd", "application/x-msschedule"}, { ".rtx", "text/richtext" },
{".sct", "text/scriptlet"}, { ".scd", "application/x-msschedule" },
{".sea", "application/octet-stream"}, { ".sct", "text/scriptlet" },
{".setpay", "application/set-payment-initiation"}, { ".sea", "application/octet-stream" },
{".setreg", "application/set-registration-initiation"}, { ".setpay", "application/set-payment-initiation" },
{".sgml", "text/sgml"}, { ".setreg", "application/set-registration-initiation" },
{".sh", "application/x-sh"}, { ".sgml", "text/sgml" },
{".shar", "application/x-shar"}, { ".sh", "application/x-sh" },
{".sit", "application/x-stuffit"}, { ".shar", "application/x-shar" },
{".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12"}, { ".sit", "application/x-stuffit" },
{".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide"}, { ".sldm", "application/vnd.ms-powerpoint.slide.macroEnabled.12" },
{".smd", "audio/x-smd"}, { ".sldx", "application/vnd.openxmlformats-officedocument.presentationml.slide" },
{".smi", "application/octet-stream"}, { ".smd", "audio/x-smd" },
{".smx", "audio/x-smd"}, { ".smi", "application/octet-stream" },
{".smz", "audio/x-smd"}, { ".smx", "audio/x-smd" },
{".snd", "audio/basic"}, { ".smz", "audio/x-smd" },
{".snp", "application/octet-stream"}, { ".snd", "audio/basic" },
{".spc", "application/x-pkcs7-certificates"}, { ".snp", "application/octet-stream" },
{".spl", "application/futuresplash"}, { ".spc", "application/x-pkcs7-certificates" },
{".spx", "audio/ogg"}, { ".spl", "application/futuresplash" },
{".src", "application/x-wais-source"}, { ".spx", "audio/ogg" },
{".ssm", "application/streamingmedia"}, { ".src", "application/x-wais-source" },
{".sst", "application/vnd.ms-pki.certstore"}, { ".ssm", "application/streamingmedia" },
{".stl", "application/vnd.ms-pki.stl"}, { ".sst", "application/vnd.ms-pki.certstore" },
{".sv4cpio", "application/x-sv4cpio"}, { ".stl", "application/vnd.ms-pki.stl" },
{".sv4crc", "application/x-sv4crc"}, { ".sv4cpio", "application/x-sv4cpio" },
{".svg", "image/svg+xml"}, { ".sv4crc", "application/x-sv4crc" },
{".svgz", "image/svg+xml"}, { ".svg", "image/svg+xml" },
{".swf", "application/x-shockwave-flash"}, { ".svgz", "image/svg+xml" },
{".t", "application/x-troff"}, { ".swf", "application/x-shockwave-flash" },
{".tar", "application/x-tar"}, { ".t", "application/x-troff" },
{".tcl", "application/x-tcl"}, { ".tar", "application/x-tar" },
{".tex", "application/x-tex"}, { ".tcl", "application/x-tcl" },
{".texi", "application/x-texinfo"}, { ".tex", "application/x-tex" },
{".texinfo", "application/x-texinfo"}, { ".texi", "application/x-texinfo" },
{".tgz", "application/x-compressed"}, { ".texinfo", "application/x-texinfo" },
{".thmx", "application/vnd.ms-officetheme"}, { ".tgz", "application/x-compressed" },
{".thn", "application/octet-stream"}, { ".thmx", "application/vnd.ms-officetheme" },
{".tif", "image/tiff"}, { ".thn", "application/octet-stream" },
{".tiff", "image/tiff"}, { ".tif", "image/tiff" },
{".toc", "application/octet-stream"}, { ".tiff", "image/tiff" },
{".tr", "application/x-troff"}, { ".toc", "application/octet-stream" },
{".trm", "application/x-msterminal"}, { ".tr", "application/x-troff" },
{".ts", "video/vnd.dlna.mpeg-tts"}, { ".trm", "application/x-msterminal" },
{".tsv", "text/tab-separated-values"}, { ".ts", "video/vnd.dlna.mpeg-tts" },
{".ttc", "application/x-font-ttf"}, { ".tsv", "text/tab-separated-values" },
{".ttf", "application/x-font-ttf"}, { ".ttc", "application/x-font-ttf" },
{".tts", "video/vnd.dlna.mpeg-tts"}, { ".ttf", "application/x-font-ttf" },
{".txt", "text/plain"}, { ".tts", "video/vnd.dlna.mpeg-tts" },
{".u32", "application/octet-stream"}, { ".txt", "text/plain" },
{".uls", "text/iuls"}, { ".u32", "application/octet-stream" },
{".ustar", "application/x-ustar"}, { ".uls", "text/iuls" },
{".vbs", "text/vbscript"}, { ".ustar", "application/x-ustar" },
{".vcf", "text/x-vcard"}, { ".vbs", "text/vbscript" },
{".vcs", "text/plain"}, { ".vcf", "text/x-vcard" },
{".vdx", "application/vnd.ms-visio.viewer"}, { ".vcs", "text/plain" },
{".vml", "text/xml"}, { ".vdx", "application/vnd.ms-visio.viewer" },
{".vsd", "application/vnd.visio"}, { ".vml", "text/xml" },
{".vss", "application/vnd.visio"}, { ".vsd", "application/vnd.visio" },
{".vst", "application/vnd.visio"}, { ".vss", "application/vnd.visio" },
{".vsto", "application/x-ms-vsto"}, { ".vst", "application/vnd.visio" },
{".vsw", "application/vnd.visio"}, { ".vsto", "application/x-ms-vsto" },
{".vsx", "application/vnd.visio"}, { ".vsw", "application/vnd.visio" },
{".vtx", "application/vnd.visio"}, { ".vsx", "application/vnd.visio" },
{".wasm", "application/wasm"}, { ".vtx", "application/vnd.visio" },
{".wav", "audio/wav"}, { ".wasm", "application/wasm" },
{".wax", "audio/x-ms-wax"}, { ".wav", "audio/wav" },
{".wbmp", "image/vnd.wap.wbmp"}, { ".wax", "audio/x-ms-wax" },
{".wcm", "application/vnd.ms-works"}, { ".wbmp", "image/vnd.wap.wbmp" },
{".wdb", "application/vnd.ms-works"}, { ".wcm", "application/vnd.ms-works" },
{".webm", "video/webm"}, { ".wdb", "application/vnd.ms-works" },
{".webp", "image/webp"}, { ".webm", "video/webm" },
{".wks", "application/vnd.ms-works"}, { ".webmanifest", "application/manifest+json" }, // https://w3c.github.io/manifest/#media-type-registration
{".wm", "video/x-ms-wm"}, { ".webp", "image/webp" },
{".wma", "audio/x-ms-wma"}, { ".wks", "application/vnd.ms-works" },
{".wmd", "application/x-ms-wmd"}, { ".wm", "video/x-ms-wm" },
{".wmf", "application/x-msmetafile"}, { ".wma", "audio/x-ms-wma" },
{".wml", "text/vnd.wap.wml"}, { ".wmd", "application/x-ms-wmd" },
{".wmlc", "application/vnd.wap.wmlc"}, { ".wmf", "application/x-msmetafile" },
{".wmls", "text/vnd.wap.wmlscript"}, { ".wml", "text/vnd.wap.wml" },
{".wmlsc", "application/vnd.wap.wmlscriptc"}, { ".wmlc", "application/vnd.wap.wmlc" },
{".wmp", "video/x-ms-wmp"}, { ".wmls", "text/vnd.wap.wmlscript" },
{".wmv", "video/x-ms-wmv"}, { ".wmlsc", "application/vnd.wap.wmlscriptc" },
{".wmx", "video/x-ms-wmx"}, { ".wmp", "video/x-ms-wmp" },
{".wmz", "application/x-ms-wmz"}, { ".wmv", "video/x-ms-wmv" },
{".woff", "application/font-woff"}, // https://www.w3.org/TR/WOFF/#appendix-b { ".wmx", "video/x-ms-wmx" },
{".woff2", "font/woff2"}, // https://www.w3.org/TR/WOFF2/#IMT { ".wmz", "application/x-ms-wmz" },
{".wps", "application/vnd.ms-works"}, { ".woff", "application/font-woff" }, // https://www.w3.org/TR/WOFF/#appendix-b
{".wri", "application/x-mswrite"}, { ".woff2", "font/woff2" }, // https://www.w3.org/TR/WOFF2/#IMT
{".wrl", "x-world/x-vrml"}, { ".wps", "application/vnd.ms-works" },
{".wrz", "x-world/x-vrml"}, { ".wri", "application/x-mswrite" },
{".wsdl", "text/xml"}, { ".wrl", "x-world/x-vrml" },
{".wtv", "video/x-ms-wtv"}, { ".wrz", "x-world/x-vrml" },
{".wvx", "video/x-ms-wvx"}, { ".wsdl", "text/xml" },
{".x", "application/directx"}, { ".wtv", "video/x-ms-wtv" },
{".xaf", "x-world/x-vrml"}, { ".wvx", "video/x-ms-wvx" },
{".xaml", "application/xaml+xml"}, { ".x", "application/directx" },
{".xap", "application/x-silverlight-app"}, { ".xaf", "x-world/x-vrml" },
{".xbap", "application/x-ms-xbap"}, { ".xaml", "application/xaml+xml" },
{".xbm", "image/x-xbitmap"}, { ".xap", "application/x-silverlight-app" },
{".xdr", "text/plain"}, { ".xbap", "application/x-ms-xbap" },
{".xht", "application/xhtml+xml"}, { ".xbm", "image/x-xbitmap" },
{".xhtml", "application/xhtml+xml"}, { ".xdr", "text/plain" },
{".xla", "application/vnd.ms-excel"}, { ".xht", "application/xhtml+xml" },
{".xlam", "application/vnd.ms-excel.addin.macroEnabled.12"}, { ".xhtml", "application/xhtml+xml" },
{".xlc", "application/vnd.ms-excel"}, { ".xla", "application/vnd.ms-excel" },
{".xlm", "application/vnd.ms-excel"}, { ".xlam", "application/vnd.ms-excel.addin.macroEnabled.12" },
{".xls", "application/vnd.ms-excel"}, { ".xlc", "application/vnd.ms-excel" },
{".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12"}, { ".xlm", "application/vnd.ms-excel" },
{".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12"}, { ".xls", "application/vnd.ms-excel" },
{".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"}, { ".xlsb", "application/vnd.ms-excel.sheet.binary.macroEnabled.12" },
{".xlt", "application/vnd.ms-excel"}, { ".xlsm", "application/vnd.ms-excel.sheet.macroEnabled.12" },
{".xltm", "application/vnd.ms-excel.template.macroEnabled.12"}, { ".xlsx", "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" },
{".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template"}, { ".xlt", "application/vnd.ms-excel" },
{".xlw", "application/vnd.ms-excel"}, { ".xltm", "application/vnd.ms-excel.template.macroEnabled.12" },
{".xml", "text/xml"}, { ".xltx", "application/vnd.openxmlformats-officedocument.spreadsheetml.template" },
{".xof", "x-world/x-vrml"}, { ".xlw", "application/vnd.ms-excel" },
{".xpm", "image/x-xpixmap"}, { ".xml", "text/xml" },
{".xps", "application/vnd.ms-xpsdocument"}, { ".xof", "x-world/x-vrml" },
{".xsd", "text/xml"}, { ".xpm", "image/x-xpixmap" },
{".xsf", "text/xml"}, { ".xps", "application/vnd.ms-xpsdocument" },
{".xsl", "text/xml"}, { ".xsd", "text/xml" },
{".xslt", "text/xml"}, { ".xsf", "text/xml" },
{".xsn", "application/octet-stream"}, { ".xsl", "text/xml" },
{".xtp", "application/octet-stream"}, { ".xslt", "text/xml" },
{".xwd", "image/x-xwindowdump"}, { ".xsn", "application/octet-stream" },
{".z", "application/x-compress"}, { ".xtp", "application/octet-stream" },
{".zip", "application/x-zip-compressed"}, { ".xwd", "image/x-xwindowdump" },
{ ".z", "application/x-compress" },
{ ".zip", "application/x-zip-compressed" }
}; };
AllowedExtraWebContentFolders = new List<string> AllowedExtraWebContentFolders = new List<string>

2
framework/src/Volo.Abp.Authorization/Volo.Abp.Authorization.csproj

@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="3.1.8" /> <PackageReference Include="Microsoft.AspNetCore.Authorization" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

2
framework/src/Volo.Abp.Autofac/Volo.Abp.Autofac.csproj

@ -17,7 +17,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" /> <PackageReference Include="Autofac.Extras.DynamicProxy" Version="5.0.0" />
<PackageReference Include="Autofac" Version="5.2.0" /> <PackageReference Include="Autofac" Version="5.2.0" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
framework/src/Volo.Abp.BackgroundJobs.Quartz/Volo.Abp.BackgroundJobs.Quartz.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />

2
framework/src/Volo.Abp.BackgroundWorkers.Quartz/Volo.Abp.BackgroundWorkers.Quartz.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />

7
framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj

@ -4,8 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RazorLangVersion>3.0</RazorLangVersion>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -13,8 +12,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Blazorise" Version="0.9.1.2" /> <PackageReference Include="Blazorise" Version="0.9.2-preview9" />
<PackageReference Include="Blazorise.DataGrid" Version="0.9.1.2" /> <PackageReference Include="Blazorise.DataGrid" Version="0.9.2-preview9" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
framework/src/Volo.Abp.BlobStoring.Aliyun/Volo.Abp.BlobStoring.Aliyun.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />

2
framework/src/Volo.Abp.BlobStoring.Aws/Volo.Abp.BlobStoring.Aws.csproj

@ -2,7 +2,7 @@
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute> <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>

4
framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<AssemblyName>Volo.Abp.BlobStoring.Minio</AssemblyName> <AssemblyName>Volo.Abp.BlobStoring.Minio</AssemblyName>

2
framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj

@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

8
framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<PackAsTool>true</PackAsTool> <PackAsTool>true</PackAsTool>
<ToolCommandName>abp</ToolCommandName> <ToolCommandName>abp</ToolCommandName>
<RootNamespace /> <RootNamespace />
@ -18,8 +18,8 @@
<PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" /> <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" /> <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
<PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" /> <PackageReference Include="Serilog.Sinks.Console" Version="3.1.1" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
framework/src/Volo.Abp.Core/System/Linq/PredicateOperator.cs

@ -1,5 +1,8 @@
using System.Collections.ObjectModel; using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection.Emit;
using System.Runtime.CompilerServices;
using JetBrains.Annotations; using JetBrains.Annotations;
namespace System.Linq namespace System.Linq
@ -246,15 +249,6 @@ namespace System.Linq
public bool TailCall => Predicate.TailCall; public bool TailCall => Predicate.TailCall;
#endif #endif
#if !(NET35 || WINDOWS_APP || NETSTANDARD || PORTABLE || PORTABLE40 || UAP)
/// <summary></summary>
public void CompileToMethod(MethodBuilder method) { Predicate.CompileToMethod(method); }
/// <summary></summary>
public void CompileToMethod(MethodBuilder method, DebugInfoGenerator debugInfoGenerator) { Predicate.CompileToMethod(method, debugInfoGenerator); }
#endif
#endregion #endregion
#region Implement Expression methods and properties #region Implement Expression methods and properties

18
framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj

@ -16,15 +16,15 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" /> <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
<PackageReference Include="System.Collections.Immutable" Version="1.7.1" /> <PackageReference Include="System.Collections.Immutable" Version="1.7.1" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Options" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Options" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Logging" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="5.0.0-rc.2.*" />
<PackageReference Include="System.Runtime.Loader" Version="4.3.0" /> <PackageReference Include="System.Runtime.Loader" Version="4.3.0" />
<PackageReference Include="System.Linq.Dynamic.Core" Version="1.1.5" /> <PackageReference Include="System.Linq.Dynamic.Core" Version="1.1.5" />
<PackageReference Include="System.Linq.Queryable" Version="4.3.0" /> <PackageReference Include="System.Linq.Queryable" Version="4.3.0" />

2
framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Abp.Dapper</AssemblyName> <AssemblyName>Volo.Abp.Dapper</AssemblyName>
<PackageId>Volo.Abp.Dapper</PackageId> <PackageId>Volo.Abp.Dapper</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

6
framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj

@ -2,9 +2,9 @@
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Abp.EntityFrameworkCore.MySQL</AssemblyName> <AssemblyName>Volo.Abp.EntityFrameworkCore.MySQL</AssemblyName>
<PackageId>Volo.Abp.EntityFrameworkCore.MySQL</PackageId> <PackageId>Volo.Abp.EntityFrameworkCore.MySQL</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -21,5 +21,5 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" /> <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="3.1.1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

26
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Microsoft/EntityFrameworkCore/AbpOracleModelBuilderExtensions.cs

@ -1,13 +1,13 @@
using Volo.Abp.EntityFrameworkCore; // using Volo.Abp.EntityFrameworkCore;
//
namespace Microsoft.EntityFrameworkCore // namespace Microsoft.EntityFrameworkCore
{ // {
public static class AbpOracleModelBuilderExtensions // public static class AbpOracleModelBuilderExtensions
{ // {
public static void UseOracle( // public static void UseOracle(
this ModelBuilder modelBuilder) // this ModelBuilder modelBuilder)
{ // {
modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle); // modelBuilder.SetDatabaseProvider(EfCoreDatabaseProvider.Oracle);
} // }
} // }
} // }

2
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.11.1034" /> <!--<PackageReference Include="Devart.Data.Oracle.EFCore" Version="9.11.1034" />-->
</ItemGroup> </ItemGroup>
</Project> </Project>

52
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleDevartExtensions.cs

@ -1,26 +1,26 @@
using JetBrains.Annotations; // using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore; // using Microsoft.EntityFrameworkCore;
using System; // using System;
using Devart.Data.Oracle.Entity; // using Devart.Data.Oracle.Entity;
using Volo.Abp.EntityFrameworkCore.DependencyInjection; // using Volo.Abp.EntityFrameworkCore.DependencyInjection;
//
namespace Volo.Abp.EntityFrameworkCore // namespace Volo.Abp.EntityFrameworkCore
{ // {
public static class AbpDbContextConfigurationContextOracleDevartExtensions // public static class AbpDbContextConfigurationContextOracleDevartExtensions
{ // {
public static DbContextOptionsBuilder UseOracle( // public static DbContextOptionsBuilder UseOracle(
[NotNull] this AbpDbContextConfigurationContext context, // [NotNull] this AbpDbContextConfigurationContext context,
[CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null, // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
bool useExistingConnectionIfAvailable = false) // bool useExistingConnectionIfAvailable = false)
{ // {
if (useExistingConnectionIfAvailable && context.ExistingConnection != null) // if (useExistingConnectionIfAvailable && context.ExistingConnection != null)
{ // {
return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction); // return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);
} // }
else // else
{ // {
return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction); // return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction);
} // }
} // }
} // }
} // }

64
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleDevartExtensions.cs

@ -1,32 +1,32 @@
using JetBrains.Annotations; // using JetBrains.Annotations;
using System; // using System;
using Devart.Data.Oracle.Entity; // using Devart.Data.Oracle.Entity;
//
namespace Volo.Abp.EntityFrameworkCore // namespace Volo.Abp.EntityFrameworkCore
{ // {
public static class AbpDbContextOptionsOracleDevartExtensions // public static class AbpDbContextOptionsOracleDevartExtensions
{ // {
public static void UseOracle( // public static void UseOracle(
[NotNull] this AbpDbContextOptions options, // [NotNull] this AbpDbContextOptions options,
[CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null, // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
bool useExistingConnectionIfAvailable = false) // bool useExistingConnectionIfAvailable = false)
{ // {
options.Configure(context => // options.Configure(context =>
{ // {
context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable); // context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
}); // });
} // }
//
public static void UseOracle<TDbContext>( // public static void UseOracle<TDbContext>(
[NotNull] this AbpDbContextOptions options, // [NotNull] this AbpDbContextOptions options,
[CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null, // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null,
bool useExistingConnectionIfAvailable = false) // bool useExistingConnectionIfAvailable = false)
where TDbContext : AbpDbContext<TDbContext> // where TDbContext : AbpDbContext<TDbContext>
{ // {
options.Configure<TDbContext>(context => // options.Configure<TDbContext>(context =>
{ // {
context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable); // context.UseOracle(oracleOptionsAction, useExistingConnectionIfAvailable);
}); // });
} // }
} // }
} // }

44
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo/Abp/EntityFrameworkCore/Oracle/Devart/AbpEntityFrameworkCoreOracleDevartModule.cs

@ -1,22 +1,22 @@
using Volo.Abp.Guids; // using Volo.Abp.Guids;
using Volo.Abp.Modularity; // using Volo.Abp.Modularity;
//
namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart // namespace Volo.Abp.EntityFrameworkCore.Oracle.Devart
{ // {
[DependsOn( // [DependsOn(
typeof(AbpEntityFrameworkCoreModule) // typeof(AbpEntityFrameworkCoreModule)
)] // )]
public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule // public class AbpEntityFrameworkCoreOracleDevartModule : AbpModule
{ // {
public override void ConfigureServices(ServiceConfigurationContext context) // public override void ConfigureServices(ServiceConfigurationContext context)
{ // {
Configure<AbpSequentialGuidGeneratorOptions>(options => // Configure<AbpSequentialGuidGeneratorOptions>(options =>
{ // {
if (options.DefaultSequentialGuidType == null) // if (options.DefaultSequentialGuidType == null)
{ // {
options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; // options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
} // }
}); // });
} // }
} // }
} // }

2
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Oracle.EntityFrameworkCore" Version="3.19.80" /> <!--<PackageReference Include="Oracle.EntityFrameworkCore" Version="3.19.80" />-->
</ItemGroup> </ItemGroup>
</Project> </Project>

50
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextConfigurationContextOracleExtensions.cs

@ -1,25 +1,25 @@
using JetBrains.Annotations; // using JetBrains.Annotations;
using Microsoft.EntityFrameworkCore; // using Microsoft.EntityFrameworkCore;
using System; // using System;
using Oracle.EntityFrameworkCore.Infrastructure; // using Oracle.EntityFrameworkCore.Infrastructure;
using Volo.Abp.EntityFrameworkCore.DependencyInjection; // using Volo.Abp.EntityFrameworkCore.DependencyInjection;
//
namespace Volo.Abp.EntityFrameworkCore // namespace Volo.Abp.EntityFrameworkCore
{ // {
public static class AbpDbContextConfigurationContextOracleExtensions // public static class AbpDbContextConfigurationContextOracleExtensions
{ // {
public static DbContextOptionsBuilder UseOracle( // public static DbContextOptionsBuilder UseOracle(
[NotNull] this AbpDbContextConfigurationContext context, // [NotNull] this AbpDbContextConfigurationContext context,
[CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
{ // {
if (context.ExistingConnection != null) // if (context.ExistingConnection != null)
{ // {
return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction); // return context.DbContextOptions.UseOracle(context.ExistingConnection, oracleOptionsAction);
} // }
else // else
{ // {
return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction); // return context.DbContextOptions.UseOracle(context.ConnectionString, oracleOptionsAction);
} // }
} // }
} // }
} // }

60
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/AbpDbContextOptionsOracleExtensions.cs

@ -1,30 +1,30 @@
using JetBrains.Annotations; // using JetBrains.Annotations;
using System; // using System;
using Oracle.EntityFrameworkCore.Infrastructure; // using Oracle.EntityFrameworkCore.Infrastructure;
//
namespace Volo.Abp.EntityFrameworkCore // namespace Volo.Abp.EntityFrameworkCore
{ // {
public static class AbpDbContextOptionsOracleExtensions // public static class AbpDbContextOptionsOracleExtensions
{ // {
public static void UseOracle( // public static void UseOracle(
[NotNull] this AbpDbContextOptions options, // [NotNull] this AbpDbContextOptions options,
[CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
{ // {
options.Configure(context => // options.Configure(context =>
{ // {
context.UseOracle(oracleOptionsAction); // context.UseOracle(oracleOptionsAction);
}); // });
} // }
//
public static void UseOracle<TDbContext>( // public static void UseOracle<TDbContext>(
[NotNull] this AbpDbContextOptions options, // [NotNull] this AbpDbContextOptions options,
[CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null) // [CanBeNull] Action<OracleDbContextOptionsBuilder> oracleOptionsAction = null)
where TDbContext : AbpDbContext<TDbContext> // where TDbContext : AbpDbContext<TDbContext>
{ // {
options.Configure<TDbContext>(context => // options.Configure<TDbContext>(context =>
{ // {
context.UseOracle(oracleOptionsAction); // context.UseOracle(oracleOptionsAction);
}); // });
} // }
} // }
} // }

44
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo/Abp/EntityFrameworkCore/Oracle/AbpEntityFrameworkCoreOracleModule.cs

@ -1,22 +1,22 @@
using Volo.Abp.Guids; // using Volo.Abp.Guids;
using Volo.Abp.Modularity; // using Volo.Abp.Modularity;
//
namespace Volo.Abp.EntityFrameworkCore.Oracle // namespace Volo.Abp.EntityFrameworkCore.Oracle
{ // {
[DependsOn( // [DependsOn(
typeof(AbpEntityFrameworkCoreModule) // typeof(AbpEntityFrameworkCoreModule)
)] // )]
public class AbpEntityFrameworkCoreOracleModule : AbpModule // public class AbpEntityFrameworkCoreOracleModule : AbpModule
{ // {
public override void ConfigureServices(ServiceConfigurationContext context) // public override void ConfigureServices(ServiceConfigurationContext context)
{ // {
Configure<AbpSequentialGuidGeneratorOptions>(options => // Configure<AbpSequentialGuidGeneratorOptions>(options =>
{ // {
if (options.DefaultSequentialGuidType == null) // if (options.DefaultSequentialGuidType == null)
{ // {
options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary; // options.DefaultSequentialGuidType = SequentialGuidType.SequentialAsBinary;
} // }
}); // });
} // }
} // }
} // }

4
framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Abp.EntityFrameworkCore.PostgreSql</AssemblyName> <AssemblyName>Volo.Abp.EntityFrameworkCore.PostgreSql</AssemblyName>
<PackageId>Volo.Abp.EntityFrameworkCore.PostgreSql</PackageId> <PackageId>Volo.Abp.EntityFrameworkCore.PostgreSql</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="3.1.4" /> <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="5.0.0-rc1" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Abp.EntityFrameworkCore.SqlServer</AssemblyName> <AssemblyName>Volo.Abp.EntityFrameworkCore.SqlServer</AssemblyName>
<PackageId>Volo.Abp.EntityFrameworkCore.SqlServer</PackageId> <PackageId>Volo.Abp.EntityFrameworkCore.SqlServer</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

4
framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Abp.EntityFrameworkCore.Sqlite</AssemblyName> <AssemblyName>Volo.Abp.EntityFrameworkCore.Sqlite</AssemblyName>
<PackageId>Volo.Abp.EntityFrameworkCore.Sqlite</PackageId> <PackageId>Volo.Abp.EntityFrameworkCore.Sqlite</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="3.1.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

6
framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.1</TargetFramework>
<AssemblyName>Volo.Abp.EntityFrameworkCore</AssemblyName> <AssemblyName>Volo.Abp.EntityFrameworkCore</AssemblyName>
<PackageId>Volo.Abp.EntityFrameworkCore</PackageId> <PackageId>Volo.Abp.EntityFrameworkCore</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -20,8 +20,8 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

15
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/DatabaseFacadeExtensions.cs

@ -1,15 +0,0 @@
using Microsoft.EntityFrameworkCore.Infrastructure;
using Microsoft.EntityFrameworkCore.Internal;
namespace Volo.Abp.EntityFrameworkCore
{
public static class DatabaseFacadeExtensions
{
public static bool IsRelational(this DatabaseFacade database)
{
#pragma warning disable EF1001 // Internal EF Core API usage.
return ((IDatabaseFacadeDependenciesAccessor)database).Dependencies is IRelationalDatabaseFacadeDependencies;
#pragma warning restore EF1001 // Internal EF Core API usage.
}
}
}

2
framework/src/Volo.Abp.EventBus.Kafka/Volo.Abp.EventBus.Kafka.csproj

@ -2,7 +2,7 @@
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace /> <RootNamespace />

2
framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj

@ -19,7 +19,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.Http.Client.IdentityModel.Web</AssemblyName> <AssemblyName>Volo.Abp.Http.Client.IdentityModel.Web</AssemblyName>
<PackageId>Volo.Abp.Http.Client.IdentityModel.Web</PackageId> <PackageId>Volo.Abp.Http.Client.IdentityModel.Web</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>

6
framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj

@ -4,7 +4,7 @@
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.Http.Client.IdentityModel.WebAssembly</AssemblyName> <AssemblyName>Volo.Abp.Http.Client.IdentityModel.WebAssembly</AssemblyName>
<PackageId>Volo.Abp.Http.Client.IdentityModel.WebAssembly</PackageId> <PackageId>Volo.Abp.Http.Client.IdentityModel.WebAssembly</PackageId>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
@ -15,9 +15,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Volo.Abp.Http.Client.IdentityModel\Volo.Abp.Http.Client.IdentityModel.csproj" /> <ProjectReference Include="..\Volo.Abp.Http.Client.IdentityModel\Volo.Abp.Http.Client.IdentityModel.csproj" />
</ItemGroup> </ItemGroup>

4
framework/src/Volo.Abp.Http.Client/Volo.Abp.Http.Client.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -15,7 +15,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Http.Polly" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Http.Polly" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
framework/src/Volo.Abp.IdentityModel/Volo.Abp.IdentityModel.csproj

@ -16,7 +16,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="IdentityModel" Version="4.3.0" /> <PackageReference Include="IdentityModel" Version="4.3.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0-rc.2.*" />
<ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" /> <ProjectReference Include="..\Volo.Abp.Caching\Volo.Abp.Caching.csproj" />
<ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" /> <ProjectReference Include="..\Volo.Abp.MultiTenancy\Volo.Abp.MultiTenancy.csproj" />
<ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" /> <ProjectReference Include="..\Volo.Abp.Threading\Volo.Abp.Threading.csproj" />

2
framework/src/Volo.Abp.Json/Volo.Abp.Json.csproj

@ -17,7 +17,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" /> <ProjectReference Include="..\Volo.Abp.Timing\Volo.Abp.Timing.csproj" />
</ItemGroup> </ItemGroup>

4
framework/src/Volo.Abp.Kafka/Volo.Abp.Kafka.csproj

@ -2,12 +2,12 @@
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework> <TargetFramework>netstandard2.0</TargetFramework>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Confluent.Kafka" Version="1.5.0" /> <PackageReference Include="Confluent.Kafka" Version="1.5.0" />
<ProjectReference Include="..\Volo.Abp.Json\Volo.Abp.Json.csproj" /> <ProjectReference Include="..\Volo.Abp.Json\Volo.Abp.Json.csproj" />

4
framework/src/Volo.Abp.Ldap/Volo.Abp.Ldap.csproj

@ -17,12 +17,12 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.2.0" /> <PackageReference Include="Novell.Directory.Ldap.NETStandard" Version="3.2.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Content Remove="Volo\Abp\Ldap\Localization\*.json" /> <Content Remove="Volo\Abp\Ldap\Localization\*.json" />
<EmbeddedResource Include="Volo\Abp\Ldap\Localization\*.json" /> <EmbeddedResource Include="Volo\Abp\Ldap\Localization\*.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" /> <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
<ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" /> <ProjectReference Include="..\Volo.Abp.Localization\Volo.Abp.Localization.csproj" />

4
framework/src/Volo.Abp.Localization/Volo.Abp.Localization.csproj

@ -13,12 +13,12 @@
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute> <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<None Remove="Volo\Abp\Localization\Resources\**\*.json" /> <None Remove="Volo\Abp\Localization\Resources\**\*.json" />
<EmbeddedResource Include="Volo\Abp\Localization\Resources\**\*.json" /> <EmbeddedResource Include="Volo\Abp\Localization\Resources\**\*.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup> </ItemGroup>

20
framework/src/Volo.Abp.Localization/Volo/Abp/Localization/AbpDictionaryBasedStringLocalizer.cs

@ -31,7 +31,7 @@ namespace Volo.Abp.Localization
includeParentCultures includeParentCultures
); );
} }
public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers) public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers)
{ {
return GetAllStrings( return GetAllStrings(
@ -41,12 +41,6 @@ namespace Volo.Abp.Localization
); );
} }
[Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
public IStringLocalizer WithCulture(CultureInfo culture)
{
return new CultureWrapperStringLocalizer(culture.Name, this);
}
protected virtual LocalizedString GetLocalizedStringFormatted(string name, params object[] arguments) protected virtual LocalizedString GetLocalizedStringFormatted(string name, params object[] arguments)
{ {
return GetLocalizedStringFormatted(name, CultureInfo.CurrentUICulture.Name, arguments); return GetLocalizedStringFormatted(name, CultureInfo.CurrentUICulture.Name, arguments);
@ -126,7 +120,7 @@ namespace Volo.Abp.Localization
} }
protected virtual IReadOnlyList<LocalizedString> GetAllStrings( protected virtual IReadOnlyList<LocalizedString> GetAllStrings(
string cultureName, string cultureName,
bool includeParentCultures = true, bool includeParentCultures = true,
bool includeBaseLocalizers = true) bool includeBaseLocalizers = true)
{ {
@ -177,7 +171,7 @@ namespace Volo.Abp.Localization
return allStrings.Values.ToImmutableList(); return allStrings.Values.ToImmutableList();
} }
public class CultureWrapperStringLocalizer : IStringLocalizer, IStringLocalizerSupportsInheritance public class CultureWrapperStringLocalizer : IStringLocalizer, IStringLocalizerSupportsInheritance
{ {
private readonly string _cultureName; private readonly string _cultureName;
@ -198,16 +192,10 @@ namespace Volo.Abp.Localization
return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures); return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures);
} }
[Obsolete("This method is obsolete. Use `CurrentCulture` and `CurrentUICulture` instead.")]
public IStringLocalizer WithCulture(CultureInfo culture)
{
return new CultureWrapperStringLocalizer(culture.Name, _innerLocalizer);
}
public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers) public IEnumerable<LocalizedString> GetAllStrings(bool includeParentCultures, bool includeBaseLocalizers)
{ {
return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers); return _innerLocalizer.GetAllStrings(_cultureName, includeParentCultures, includeBaseLocalizers);
} }
} }
} }
} }

4
framework/src/Volo.Abp.ObjectExtending/Volo.Abp.ObjectExtending.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />
@ -19,4 +19,4 @@
<ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" /> <ProjectReference Include="..\Volo.Abp.Localization.Abstractions\Volo.Abp.Localization.Abstractions.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
framework/src/Volo.Abp.Quartz/Volo.Abp.Quartz.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />

126
framework/src/Volo.Abp.Serialization/Volo/Abp/Serialization/Binary/BinarySerializationHelper.cs

@ -1,126 +0,0 @@
using System;
using System.IO;
using System.Runtime.Serialization;
using System.Runtime.Serialization.Formatters.Binary;
namespace Volo.Abp.Serialization.Binary
{
/// <summary>
/// This class is used to simplify serialization/deserialization operations.
/// Uses .NET binary serialization.
/// </summary>
public static class BinarySerializationHelper
{
/// <summary>
/// Serializes an object and returns as a byte array.
/// </summary>
/// <param name="obj">object to be serialized</param>
/// <returns>bytes of object</returns>
public static byte[] Serialize(object obj)
{
using (var memoryStream = new MemoryStream())
{
Serialize(obj, memoryStream);
return memoryStream.ToArray();
}
}
/// <summary>
/// Serializes an object into a stream.
/// </summary>
/// <param name="obj">object to be serialized</param>
/// <param name="stream">Stream to serialize in</param>
/// <returns>bytes of object</returns>
public static void Serialize(object obj, Stream stream)
{
CreateBinaryFormatter().Serialize(stream, obj);
}
/// <summary>
/// Deserializes an object from given byte array.
/// </summary>
/// <param name="bytes">The byte array that contains object</param>
/// <returns>deserialized object</returns>
public static object Deserialize(byte[] bytes)
{
using (var memoryStream = new MemoryStream(bytes))
{
return Deserialize(memoryStream);
}
}
/// <summary>
/// Deserializes an object from given stream.
/// </summary>
/// <param name="stream">The stream that contains object</param>
/// <returns>deserialized object</returns>
public static object Deserialize(Stream stream)
{
return CreateBinaryFormatter().Deserialize(stream);
}
/// <summary>
/// Deserializes an object from given byte array.
/// Difference from <see cref="Deserialize(byte[])"/> is that; this method can also deserialize
/// types that are defined in dynamically loaded assemblies (like PlugIns).
/// </summary>
/// <param name="bytes">The byte array that contains object</param>
/// <returns>deserialized object</returns>
public static object DeserializeExtended(byte[] bytes)
{
using (var memoryStream = new MemoryStream(bytes))
{
return CreateBinaryFormatter(true).Deserialize(memoryStream);
}
}
/// <summary>
/// Deserializes an object from given stream.
/// Difference from <see cref="Deserialize(Stream)"/> is that; this method can also deserialize
/// types that are defined in dynamically loaded assemblies (like PlugIns).
/// </summary>
/// <param name="stream">The stream that contains object</param>
/// <returns>deserialized object</returns>
public static object DeserializeExtended(Stream stream)
{
return CreateBinaryFormatter(true).Deserialize(stream);
}
private static BinaryFormatter CreateBinaryFormatter(bool extended = false)
{
if (extended)
{
return new BinaryFormatter
{
//TODO: AssemblyFormat = System.Runtime.Serialization.Formatters.FormatterAssemblyStyle.Simple,
Binder = new ExtendedSerializationBinder()
};
}
else
{
return new BinaryFormatter();
}
}
/// <summary>
/// This class is used in deserializing to allow deserializing objects that are defined
/// in assemlies that are load in runtime (like PlugIns).
/// </summary>
private sealed class ExtendedSerializationBinder : SerializationBinder
{
public override Type BindToType(string assemblyName, string typeName)
{
var toAssemblyName = assemblyName.Split(',')[0];
foreach (var assembly in AppDomain.CurrentDomain.GetAssemblies())
{
if (assembly.FullName.Split(',')[0] == toAssemblyName)
{
return assembly.GetType(typeName);
}
}
return Type.GetType(string.Format("{0}, {1}", typeName, assemblyName));
}
}
}
}

8
framework/src/Volo.Abp.Serialization/Volo/Abp/Serialization/DefaultObjectSerializer.cs

@ -1,8 +1,8 @@
using System; using System;
using System.Text.Json;
using JetBrains.Annotations; using JetBrains.Annotations;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Volo.Abp.DependencyInjection; using Volo.Abp.DependencyInjection;
using Volo.Abp.Serialization.Binary;
namespace Volo.Abp.Serialization namespace Volo.Abp.Serialization
{ {
@ -58,12 +58,12 @@ namespace Volo.Abp.Serialization
protected virtual byte[] AutoSerialize<T>(T obj) protected virtual byte[] AutoSerialize<T>(T obj)
{ {
return BinarySerializationHelper.Serialize(obj); return JsonSerializer.SerializeToUtf8Bytes(obj);
} }
protected virtual T AutoDeserialize<T>(byte[] bytes) protected virtual T AutoDeserialize<T>(byte[] bytes)
{ {
return (T) BinarySerializationHelper.DeserializeExtended(bytes); return JsonSerializer.Deserialize<T>(bytes);
} }
} }
} }

2
framework/src/Volo.Abp.TextTemplating/Volo.Abp.TextTemplating.csproj

@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\configureawait.props" /> <Import Project="..\..\..\configureawait.props" />
<Import Project="..\..\..\common.props" /> <Import Project="..\..\..\common.props" />

2
framework/src/Volo.Abp.UI/Volo.Abp.UI.csproj

@ -18,7 +18,7 @@
<EmbeddedResource Include="Localization\**\*.json" /> <EmbeddedResource Include="Localization\**\*.json" />
<Content Remove="Localization\**\*.json" /> <Content Remove="Localization\**\*.json" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Volo.Abp.ExceptionHandling\Volo.Abp.ExceptionHandling.csproj" /> <ProjectReference Include="..\Volo.Abp.ExceptionHandling\Volo.Abp.ExceptionHandling.csproj" />
</ItemGroup> </ItemGroup>

2
framework/src/Volo.Abp.Validation.Abstractions/Volo.Abp.Validation.Abstractions.csproj

@ -18,4 +18,4 @@
<ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" /> <ProjectReference Include="..\Volo.Abp.Core\Volo.Abp.Core.csproj" />
</ItemGroup> </ItemGroup>
</Project> </Project>

6
framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj

@ -15,9 +15,9 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
framework/test/AbpTestBase/AbpTestBase.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>AbpTestBase</AssemblyName> <AssemblyName>AbpTestBase</AssemblyName>
<PackageId>AbpTestBase</PackageId> <PackageId>AbpTestBase</PackageId>
<RootNamespace /> <RootNamespace />

4
framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj

@ -2,7 +2,7 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
@ -18,7 +18,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Hosting" Version="5.0.0-rc.2.*" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Authentication.OAuth.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Authentication.OAuth.Tests</PackageId>

4
framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.MultiTenancy.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.MultiTenancy.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.MultiTenancy.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.MultiTenancy.Tests</PackageId>
<RootNamespace /> <RootNamespace />

2
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.Tests</PackageId>

15
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/ModelBinding/ModelBindingController_Tests.cs

@ -43,8 +43,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
response.StatusCode.ShouldBe(HttpStatusCode.OK); response.StatusCode.ShouldBe(HttpStatusCode.OK);
var resultAsString = await response.Content.ReadAsStringAsync(); var resultAsString = await response.Content.ReadAsStringAsync();
//Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local. //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is UTC
resultAsString.ShouldBe(DateTimeKind.Local.ToString().ToLower()); //https://docs.microsoft.com/en-us/aspnet/core/migration/31-to-50?view=aspnetcore-3.1&tabs=visual-studio#datetime-values-are-model-bound-as-utc-times
resultAsString.ShouldBe(DateTimeKind.Utc.ToString().ToLower());
} }
[Fact] [Fact]
@ -56,8 +57,9 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
response.StatusCode.ShouldBe(HttpStatusCode.OK); response.StatusCode.ShouldBe(HttpStatusCode.OK);
var resultAsString = await response.Content.ReadAsStringAsync(); var resultAsString = await response.Content.ReadAsStringAsync();
//Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local. //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is UTC
resultAsString.ShouldBe(DateTimeKind.Local.ToString().ToLower()); //https://docs.microsoft.com/en-us/aspnet/core/migration/31-to-50?view=aspnetcore-3.1&tabs=visual-studio#datetime-values-are-model-bound-as-utc-times
resultAsString.ShouldBe(DateTimeKind.Utc.ToString().ToLower());
} }
[Fact] [Fact]
@ -71,9 +73,10 @@ namespace Volo.Abp.AspNetCore.Mvc.ModelBinding
response.StatusCode.ShouldBe(HttpStatusCode.OK); response.StatusCode.ShouldBe(HttpStatusCode.OK);
var resultAsString = await response.Content.ReadAsStringAsync(); var resultAsString = await response.Content.ReadAsStringAsync();
//Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is Local. //Time parameter(2010-01-01T00:00:00Z) with time zone information, so the default Kind is UTC
//https://docs.microsoft.com/en-us/aspnet/core/migration/31-to-50?view=aspnetcore-3.1&tabs=visual-studio#datetime-values-are-model-bound-as-utc-times
resultAsString.ShouldBe( resultAsString.ShouldBe(
$"local_{DateTimeKind.ToString().ToLower()}_{DateTimeKind.ToString().ToLower()}_local"); $"utc_{DateTimeKind.ToString().ToLower()}_{DateTimeKind.ToString().ToLower()}_utc");
} }
} }

2
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.Tests</PackageId>

6
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo.csproj

@ -1,14 +1,14 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.0-rc.2.*" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" /> <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" /> <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
</ItemGroup> </ItemGroup>

2
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.UI.Tests</PackageId>

4
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
</PropertyGroup> </PropertyGroup>
@ -15,7 +15,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.3" /> <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.0-rc.2.*" />
<PackageReference Include="Serilog.AspNetCore" Version="3.2.0" /> <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" /> <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
</ItemGroup> </ItemGroup>

2
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj

@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk.Web"> <Project Sdk="Microsoft.NET.Sdk.Web">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> <AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Versioning.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Mvc.Versioning.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Mvc.Versioning.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Mvc.Versioning.Tests</PackageId>

2
framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Serilog.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Serilog.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Serilog.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Serilog.Tests</PackageId>
<RootNamespace /> <RootNamespace />

4
framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>

6
framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AspNetCore.Tests</AssemblyName> <AssemblyName>Volo.Abp.AspNetCore.Tests</AssemblyName>
<PackageId>Volo.Abp.AspNetCore.Tests</PackageId> <PackageId>Volo.Abp.AspNetCore.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@ -15,7 +15,7 @@
<PreserveCompilationReferences>true</PreserveCompilationReferences> <PreserveCompilationReferences>true</PreserveCompilationReferences>
<RootNamespace /> <RootNamespace />
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<EmbeddedResource Include="wwwroot\SampleFiles\**\*.*" /> <EmbeddedResource Include="wwwroot\SampleFiles\**\*.*" />
<None Remove="wwwroot\SampleFiles\**\*.*" /> <None Remove="wwwroot\SampleFiles\**\*.*" />

2
framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.Auditing.Tests</AssemblyName> <AssemblyName>Volo.Abp.Auditing.Tests</AssemblyName>
<PackageId>Volo.Abp.Auditing.Tests</PackageId> <PackageId>Volo.Abp.Auditing.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

2
framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.Authorization.Tests</AssemblyName> <AssemblyName>Volo.Abp.Authorization.Tests</AssemblyName>
<PackageId>Volo.Abp.Authorization.Tests</PackageId> <PackageId>Volo.Abp.Authorization.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

4
framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.AutoMapper.Tests</AssemblyName> <AssemblyName>Volo.Abp.AutoMapper.Tests</AssemblyName>
<PackageId>Volo.Abp.AutoMapper.Tests</PackageId> <PackageId>Volo.Abp.AutoMapper.Tests</PackageId>
<RootNamespace /> <RootNamespace />

2
framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.Autofac.Tests</AssemblyName> <AssemblyName>Volo.Abp.Autofac.Tests</AssemblyName>
<PackageId>Volo.Abp.Autofac.Tests</PackageId> <PackageId>Volo.Abp.Autofac.Tests</PackageId>
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> <GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>

4
framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj

@ -1,9 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<AssemblyName>Volo.Abp.BackgroundJobs.Tests</AssemblyName> <AssemblyName>Volo.Abp.BackgroundJobs.Tests</AssemblyName>
<PackageId>Volo.Abp.BackgroundJobs.Tests</PackageId> <PackageId>Volo.Abp.BackgroundJobs.Tests</PackageId>
<RootNamespace /> <RootNamespace />

4
framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> <UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId>
</PropertyGroup> </PropertyGroup>
@ -12,7 +12,7 @@
<ProjectReference Include="..\..\src\Volo.Abp.BlobStoring.Aliyun\Volo.Abp.BlobStoring.Aliyun.csproj" /> <ProjectReference Include="..\..\src\Volo.Abp.BlobStoring.Aliyun\Volo.Abp.BlobStoring.Aliyun.csproj" />
<ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" /> <ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
<ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" /> <ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="3.1.8" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="5.0.0-rc.2.*" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.6.1" />
<ProjectReference Include="..\Volo.Abp.BlobStoring.Tests\Volo.Abp.BlobStoring.Tests.csproj" /> <ProjectReference Include="..\Volo.Abp.BlobStoring.Tests\Volo.Abp.BlobStoring.Tests.csproj" />
</ItemGroup> </ItemGroup>

2
framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> <UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId>
</PropertyGroup> </PropertyGroup>

2
framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj

@ -3,7 +3,7 @@
<Import Project="..\..\..\common.test.props" /> <Import Project="..\..\..\common.test.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace /> <RootNamespace />
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> <UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId>
</PropertyGroup> </PropertyGroup>

Some files were not shown because too many files changed in this diff

Loading…
Cancel
Save