Browse Source
Merge pull request #13626 from abpframework/net7
Upgrade to NET 7.0.
pull/14366/head
Halil İbrahim Kalkan
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
412 changed files with
499 additions and
489 deletions
-
.github/workflows/build-and-test.yml
-
Directory.Build.props
-
build/build-all.ps1
-
framework/src/Volo.Abp.AspNetCore.Authentication.JwtBearer/Volo.Abp.AspNetCore.Authentication.JwtBearer.csproj
-
framework/src/Volo.Abp.AspNetCore.Authentication.OAuth/Volo.Abp.AspNetCore.Authentication.OAuth.csproj
-
framework/src/Volo.Abp.AspNetCore.Authentication.OpenIdConnect/Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj
-
framework/src/Volo.Abp.AspNetCore.Components.Server.Theming/Volo.Abp.AspNetCore.Components.Server.Theming.csproj
-
framework/src/Volo.Abp.AspNetCore.Components.Server/Volo.Abp.AspNetCore.Components.Server.csproj
-
framework/src/Volo.Abp.AspNetCore.Components.Web.Theming/Volo.Abp.AspNetCore.Components.Web.Theming.csproj
-
framework/src/Volo.Abp.AspNetCore.Components.Web/Volo.Abp.AspNetCore.Components.Web.csproj
-
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly.Theming/Volo.Abp.AspNetCore.Components.WebAssembly.Theming.csproj
-
framework/src/Volo.Abp.AspNetCore.Components.WebAssembly/Volo.Abp.AspNetCore.Components.WebAssembly.csproj
-
framework/src/Volo.Abp.AspNetCore.Components/Volo.Abp.AspNetCore.Components.csproj
-
framework/src/Volo.Abp.AspNetCore.MultiTenancy/Volo.Abp.AspNetCore.MultiTenancy.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.Client/Volo.Abp.AspNetCore.Mvc.Client.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus/Volo.Abp.AspNetCore.Mvc.Dapr.EventBus.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.Dapr/Volo.Abp.AspNetCore.Mvc.Dapr.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions/Volo.Abp.AspNetCore.Mvc.UI.Bundling.Abstractions.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Bundling/Volo.Abp.AspNetCore.Mvc.UI.Bundling.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy/Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo.Abp.AspNetCore.Mvc.UI.Packages.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI.Widgets/Volo.Abp.AspNetCore.Mvc.UI.Widgets.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc.UI/Volo.Abp.AspNetCore.Mvc.UI.csproj
-
framework/src/Volo.Abp.AspNetCore.Mvc/Volo.Abp.AspNetCore.Mvc.csproj
-
framework/src/Volo.Abp.AspNetCore.Serilog/Volo.Abp.AspNetCore.Serilog.csproj
-
framework/src/Volo.Abp.AspNetCore.SignalR/Volo.Abp.AspNetCore.SignalR.csproj
-
framework/src/Volo.Abp.AspNetCore.TestBase/Volo.Abp.AspNetCore.TestBase.csproj
-
framework/src/Volo.Abp.AspNetCore/Volo.Abp.AspNetCore.csproj
-
framework/src/Volo.Abp.AutoMapper/Volo.Abp.AutoMapper.csproj
-
framework/src/Volo.Abp.Autofac.WebAssembly/Volo.Abp.Autofac.WebAssembly.csproj
-
framework/src/Volo.Abp.BlazoriseUI/Volo.Abp.BlazoriseUI.csproj
-
framework/src/Volo.Abp.BlobStoring.Minio/Volo.Abp.BlobStoring.Minio.csproj
-
framework/src/Volo.Abp.Caching.StackExchangeRedis/Volo.Abp.Caching.StackExchangeRedis.csproj
-
framework/src/Volo.Abp.Caching/Volo.Abp.Caching.csproj
-
framework/src/Volo.Abp.Cli/Volo.Abp.Cli.csproj
-
framework/src/Volo.Abp.Core/Volo.Abp.Core.csproj
-
framework/src/Volo.Abp.Dapper/Volo.Abp.Dapper.csproj
-
framework/src/Volo.Abp.Dapr/Volo.Abp.Dapr.csproj
-
framework/src/Volo.Abp.DistributedLocking.Dapr/Volo.Abp.DistributedLocking.Dapr.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.MySQL/Volo.Abp.EntityFrameworkCore.MySQL.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.Oracle.Devart/Volo.Abp.EntityFrameworkCore.Oracle.Devart.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.PostgreSql/Volo.Abp.EntityFrameworkCore.PostgreSql.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.SqlServer/Volo.Abp.EntityFrameworkCore.SqlServer.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore.Sqlite/Volo.Abp.EntityFrameworkCore.Sqlite.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore/Volo.Abp.EntityFrameworkCore.csproj
-
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/AbpDbContext.cs
-
framework/src/Volo.Abp.EntityFrameworkCore/Volo/Abp/EntityFrameworkCore/ValueConverters/AbpDateTimeValueConverter.cs
-
framework/src/Volo.Abp.EventBus.Dapr/Volo.Abp.EventBus.Dapr.csproj
-
framework/src/Volo.Abp.ExceptionHandling/Volo.Abp.ExceptionHandling.csproj
-
framework/src/Volo.Abp.Http.Client.Dapr/Volo.Abp.Http.Client.Dapr.csproj
-
framework/src/Volo.Abp.Http.Client.IdentityModel.Web/Volo.Abp.Http.Client.IdentityModel.Web.csproj
-
framework/src/Volo.Abp.Http.Client.IdentityModel.WebAssembly/Volo.Abp.Http.Client.IdentityModel.WebAssembly.csproj
-
framework/src/Volo.Abp.Http.Client.Web/Volo.Abp.Http.Client.Web.csproj
-
framework/src/Volo.Abp.Swashbuckle/Volo.Abp.Swashbuckle.csproj
-
framework/src/Volo.Abp.TextTemplating.Razor/Volo.Abp.TextTemplating.Razor.csproj
-
framework/src/Volo.Abp.VirtualFileSystem/Volo.Abp.VirtualFileSystem.csproj
-
framework/test/AbpTestBase/AbpTestBase.csproj
-
framework/test/SimpleConsoleDemo/SimpleConsoleDemo.csproj
-
framework/test/Volo.Abp.AspNetCore.Authentication.OAuth.Tests/Volo.Abp.AspNetCore.Authentication.OAuth.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.MultiTenancy.Tests/Volo.Abp.AspNetCore.MultiTenancy.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.Mvc.PlugIn/Volo.Abp.AspNetCore.Mvc.PlugIn.csproj
-
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo.Abp.AspNetCore.Mvc.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.Mvc.Tests/Volo/Abp/AspNetCore/Mvc/Startup.cs
-
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Tests/Volo.Abp.AspNetCore.Mvc.UI.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.Mvc.Versioning.Tests/Volo.Abp.AspNetCore.Mvc.Versioning.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.Serilog.Tests/Volo.Abp.AspNetCore.Serilog.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.SignalR.Tests/Volo.Abp.AspNetCore.SignalR.Tests.csproj
-
framework/test/Volo.Abp.AspNetCore.Tests/Volo.Abp.AspNetCore.Tests.csproj
-
framework/test/Volo.Abp.Auditing.Tests/Volo.Abp.Auditing.Tests.csproj
-
framework/test/Volo.Abp.Auditing.Tests/Volo/Abp/Auditing/JsonNetAuditSerializer_Test.cs
-
framework/test/Volo.Abp.Authorization.Tests/Volo.Abp.Authorization.Tests.csproj
-
framework/test/Volo.Abp.AutoMapper.Tests/Volo.Abp.AutoMapper.Tests.csproj
-
framework/test/Volo.Abp.Autofac.Tests/Volo.Abp.Autofac.Tests.csproj
-
framework/test/Volo.Abp.BackgroundJobs.Tests/Volo.Abp.BackgroundJobs.Tests.csproj
-
framework/test/Volo.Abp.BlobStoring.Aliyun.Tests/Volo.Abp.BlobStoring.Aliyun.Tests.csproj
-
framework/test/Volo.Abp.BlobStoring.Aws.Tests/Volo.Abp.BlobStoring.Aws.Tests.csproj
-
framework/test/Volo.Abp.BlobStoring.Azure.Tests/Volo.Abp.BlobStoring.Azure.Tests.csproj
-
framework/test/Volo.Abp.BlobStoring.FileSystem.Tests/Volo.Abp.BlobStoring.FileSystem.Tests.csproj
-
framework/test/Volo.Abp.BlobStoring.Minio.Tests/Volo.Abp.BlobStoring.Minio.Tests.csproj
-
framework/test/Volo.Abp.BlobStoring.Tests/Volo.Abp.BlobStoring.Tests.csproj
-
framework/test/Volo.Abp.Caching.StackExchangeRedis.Tests/Volo.Abp.Caching.StackExchangeRedis.Tests.csproj
-
framework/test/Volo.Abp.Caching.Tests/Volo.Abp.Caching.Tests.csproj
-
framework/test/Volo.Abp.Castle.Core.Tests/Volo.Abp.Castle.Core.Tests.csproj
-
framework/test/Volo.Abp.Cli.Core.Tests/Volo.Abp.Cli.Core.Tests.csproj
-
framework/test/Volo.Abp.Core.Tests/Volo.Abp.Core.Tests.csproj
-
framework/test/Volo.Abp.Dapper.Tests/Volo.Abp.Dapper.Tests.csproj
-
framework/test/Volo.Abp.Data.Tests/Volo.Abp.Data.Tests.csproj
-
framework/test/Volo.Abp.Ddd.Tests/Volo.Abp.Ddd.Tests.csproj
-
framework/test/Volo.Abp.DistributedLocking.Abstractions.Tests/Volo.Abp.DistributedLocking.Abstractions.Tests.csproj
-
framework/test/Volo.Abp.Emailing.Tests/Volo.Abp.Emailing.Tests.csproj
-
framework/test/Volo.Abp.EntityFrameworkCore.Tests.SecondContext/Volo.Abp.EntityFrameworkCore.Tests.SecondContext.csproj
-
framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo.Abp.EntityFrameworkCore.Tests.csproj
-
framework/test/Volo.Abp.EntityFrameworkCore.Tests/Volo/Abp/EntityFrameworkCore/UnitTestModelCacheKeyFactory.cs
-
framework/test/Volo.Abp.EventBus.Tests/Volo.Abp.EventBus.Tests.csproj
-
framework/test/Volo.Abp.Features.Tests/Volo.Abp.Features.Tests.csproj
|
|
|
@ -47,7 +47,7 @@ jobs: |
|
|
|
- uses: actions/checkout@v2 |
|
|
|
- uses: actions/setup-dotnet@master |
|
|
|
with: |
|
|
|
dotnet-version: 6.0.100 |
|
|
|
dotnet-version: 7.0.100-rc.2.22477.23 |
|
|
|
|
|
|
|
- name: Build All |
|
|
|
run: .\build-all.ps1 -f |
|
|
|
|
|
|
|
@ -2,13 +2,13 @@ |
|
|
|
<PropertyGroup> |
|
|
|
|
|
|
|
<!-- All Microsoft AspNetCore packages --> |
|
|
|
<MicrosoftAspNetCorePackageVersion>6.0.5</MicrosoftAspNetCorePackageVersion> |
|
|
|
<MicrosoftAspNetCorePackageVersion>7.0.0-rc.2.*</MicrosoftAspNetCorePackageVersion> |
|
|
|
|
|
|
|
<!-- All Microsoft EntityFrameworkCore packages --> |
|
|
|
<MicrosoftEntityFrameworkCorePackageVersion>6.0.5</MicrosoftEntityFrameworkCorePackageVersion> |
|
|
|
<MicrosoftEntityFrameworkCorePackageVersion>7.0.0-rc.2.*</MicrosoftEntityFrameworkCorePackageVersion> |
|
|
|
|
|
|
|
<!-- All Microsoft packages --> |
|
|
|
<MicrosoftPackageVersion>6.0.0</MicrosoftPackageVersion> |
|
|
|
<MicrosoftPackageVersion>7.0.0-rc.2.*</MicrosoftPackageVersion> |
|
|
|
|
|
|
|
<!-- Microsoft.NET.Test.Sdk https://www.nuget.org/packages/Microsoft.NET.Test.Sdk --> |
|
|
|
<MicrosoftNETTestSdkPackageVersion>17.2.0</MicrosoftNETTestSdkPackageVersion> |
|
|
|
|
|
|
|
@ -6,6 +6,8 @@ $full = $args[0] |
|
|
|
|
|
|
|
Write-Host $solutionPaths |
|
|
|
|
|
|
|
dotnet workload install wasm-tools |
|
|
|
|
|
|
|
foreach ($solutionPath in $solutionPaths) { |
|
|
|
$solutionAbsPath = (Join-Path $rootFolder $solutionPath) |
|
|
|
Set-Location $solutionAbsPath |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Authentication.JwtBearer</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Authentication.JwtBearer</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Authentication.OAuth</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<IsPackable>true</IsPackable> |
|
|
|
<OutputType>Library</OutputType> |
|
|
|
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<IsPackable>true</IsPackable> |
|
|
|
<OutputType>Library</OutputType> |
|
|
|
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Components.WebAssembly</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Components.WebAssembly</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Components</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Components</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.MultiTenancy</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.MultiTenancy</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Client</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.Client</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<ImplicitUsings>enable</ImplicitUsings> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<ImplicitUsings>enable</ImplicitUsings> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bootstrap</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Bundling</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Bundling</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Packages</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Packages</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Demo</PackageId> |
|
|
|
@ -26,7 +26,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Widgets</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Widgets</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AddRazorSupportForMvc>true</AddRazorSupportForMvc> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc</PackageId> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Serilog</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Serilog</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.SignalR</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.SignalR</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.TestBase</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.TestBase</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -21,7 +21,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="AutoMapper" Version="11.0.1" /> |
|
|
|
<PackageReference Include="AutoMapper" Version="12.0.0" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.BlobStoring.Minio</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.BlobStoring.Minio</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="6.0.5" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -15,7 +15,7 @@ |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -5,7 +5,7 @@ |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<OutputType>Exe</OutputType> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<PackAsTool>true</PackAsTool> |
|
|
|
<ToolCommandName>abp</ToolCommandName> |
|
|
|
<RootNamespace /> |
|
|
|
@ -18,7 +18,7 @@ |
|
|
|
<PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.File" Version="5.0.0" /> |
|
|
|
<PackageReference Include="Serilog.Sinks.Console" Version="4.1.0" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -15,10 +15,10 @@ |
|
|
|
</PropertyGroup> |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="System.Collections.Immutable" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Localization" Version="6.0.5" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Localization" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Options" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Dapper</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Dapper</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<ImplicitUsings>enable</ImplicitUsings> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<ImplicitUsings>enable</ImplicitUsings> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore.MySQL</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore.MySQL</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore.Oracle.Devart</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore.Oracle.Devart</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore.Oracle</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore.Oracle</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore.PostgreSql</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore.PostgreSql</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="6.0.2" /> |
|
|
|
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.0-rc.1" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore.SqlServer</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore.SqlServer</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore.Sqlite</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore.Sqlite</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.EntityFrameworkCore</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.EntityFrameworkCore</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -618,8 +618,6 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext, |
|
|
|
return; |
|
|
|
} |
|
|
|
|
|
|
|
var dateTimeValueConverter = new AbpDateTimeValueConverter(Clock); |
|
|
|
|
|
|
|
var dateTimePropertyInfos = typeof(TEntity).GetProperties() |
|
|
|
.Where(property => |
|
|
|
(property.PropertyType == typeof(DateTime) || |
|
|
|
@ -633,7 +631,9 @@ public abstract class AbpDbContext<TDbContext> : DbContext, IAbpEfCoreDbContext, |
|
|
|
modelBuilder |
|
|
|
.Entity<TEntity>() |
|
|
|
.Property(property.Name) |
|
|
|
.HasConversion(dateTimeValueConverter); |
|
|
|
.HasConversion(property.PropertyType == typeof(DateTime) |
|
|
|
? new AbpDateTimeValueConverter(Clock) |
|
|
|
: new AbpNullableDateTimeValueConverter(Clock)); |
|
|
|
}); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -5,9 +5,19 @@ using Volo.Abp.Timing; |
|
|
|
|
|
|
|
namespace Volo.Abp.EntityFrameworkCore.ValueConverters; |
|
|
|
|
|
|
|
public class AbpDateTimeValueConverter : ValueConverter<DateTime?, DateTime?> |
|
|
|
public class AbpDateTimeValueConverter : ValueConverter<DateTime, DateTime> |
|
|
|
{ |
|
|
|
public AbpDateTimeValueConverter(IClock clock, [CanBeNull] ConverterMappingHints mappingHints = null) |
|
|
|
: base( |
|
|
|
x => clock.Normalize(x), |
|
|
|
x => clock.Normalize(x), mappingHints) |
|
|
|
{ |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
public class AbpNullableDateTimeValueConverter : ValueConverter<DateTime?, DateTime?> |
|
|
|
{ |
|
|
|
public AbpNullableDateTimeValueConverter(IClock clock, [CanBeNull] ConverterMappingHints mappingHints = null) |
|
|
|
: base( |
|
|
|
x => x.HasValue ? clock.Normalize(x.Value) : x, |
|
|
|
x => x.HasValue ? clock.Normalize(x.Value) : x, mappingHints) |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<ImplicitUsings>enable</ImplicitUsings> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -19,7 +19,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
</Project> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<ImplicitUsings>enable</ImplicitUsings> |
|
|
|
<Nullable>enable</Nullable> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Http.Client.IdentityModel.Web</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Http.Client.IdentityModel.Web</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Http.Client.IdentityModel.WebAssembly</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Http.Client.IdentityModel.WebAssembly</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Http.Client.Web</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Http.Client.Web</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -4,7 +4,7 @@ |
|
|
|
<Import Project="..\..\..\common.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Swashbuckle</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Swashbuckle</PackageId> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
|
|
|
|
@ -14,7 +14,7 @@ |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(MicrosoftCodeAnalysisPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="$(MicrosoftAspNetCorePackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.AspNetCore.Razor.Language" Version="6.0.8" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -17,7 +17,7 @@ |
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Composite" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Physical" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>AbpTestBase</AssemblyName> |
|
|
|
<PackageId>AbpTestBase</PackageId> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -2,7 +2,7 @@ |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<OutputType>Exe</OutputType> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
@ -18,7 +18,7 @@ |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Hosting" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<LangVersion>latest</LangVersion> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Authentication.OAuth.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Authentication.OAuth.Tests</PackageId> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.MultiTenancy.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.MultiTenancy.Tests</PackageId> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web"> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<OutputType>Library</OutputType> |
|
|
|
<IsPackable>true</IsPackable> |
|
|
|
<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.Tests</PackageId> |
|
|
|
|
|
|
|
@ -16,10 +16,10 @@ public class Startup |
|
|
|
var hostEnvironment = services.GetHostingEnvironment(); |
|
|
|
#if DEBUG
|
|
|
|
var plugDllInPath = Path.Combine(hostEnvironment.ContentRootPath, |
|
|
|
@"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Debug\net6.0\"); |
|
|
|
@"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Debug\net7.0\"); |
|
|
|
#else
|
|
|
|
plugDllInPath = Path.Combine(_env.ContentRootPath, |
|
|
|
@"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Release\net6.0\"); |
|
|
|
@"..\..\..\..\..\Volo.Abp.AspNetCore.Mvc.PlugIn\bin\Release\net7.0\"); |
|
|
|
#endif
|
|
|
|
|
|
|
|
options.PlugInSources.AddFolder(plugDllInPath); |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.UI.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.UI.Tests</PackageId> |
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project Sdk="Microsoft.NET.Sdk.Web"> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
<ItemGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Mvc.Versioning.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Mvc.Versioning.Tests</PackageId> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Serilog.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Serilog.Tests</PackageId> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AspNetCore.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AspNetCore.Tests</PackageId> |
|
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Auditing.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Auditing.Tests</PackageId> |
|
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
|
|
|
|
|
|
|
@ -8,13 +8,6 @@ namespace Volo.Abp.Auditing; |
|
|
|
|
|
|
|
public class JsonNetAuditSerializer_Test : AbpAuditingTestBase |
|
|
|
{ |
|
|
|
private readonly JsonNetAuditSerializer _jsonNetAuditSerializer; |
|
|
|
|
|
|
|
public JsonNetAuditSerializer_Test() |
|
|
|
{ |
|
|
|
_jsonNetAuditSerializer = GetRequiredService<JsonNetAuditSerializer>(); |
|
|
|
} |
|
|
|
|
|
|
|
protected override void AfterAddApplication(IServiceCollection services) |
|
|
|
{ |
|
|
|
services.Configure<AbpAuditingOptions>(options => |
|
|
|
@ -34,7 +27,7 @@ public class JsonNetAuditSerializer_Test : AbpAuditingTestBase |
|
|
|
{"input2", new Input2Dto {UserName = "admin", Password = "1q2w3E*", Birthday = DateTime.Now}} |
|
|
|
}; |
|
|
|
|
|
|
|
var str = _jsonNetAuditSerializer.Serialize(arguments); |
|
|
|
var str = GetRequiredService<JsonNetAuditSerializer>().Serialize(arguments); |
|
|
|
|
|
|
|
str.ShouldNotContain("IdCard"); |
|
|
|
str.ShouldNotContain("1q2w3E*"); |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Authorization.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Authorization.Tests</PackageId> |
|
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.AutoMapper.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.AutoMapper.Tests</PackageId> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Autofac.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Autofac.Tests</PackageId> |
|
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.BackgroundJobs.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.BackgroundJobs.Tests</PackageId> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> |
|
|
|
</PropertyGroup> |
|
|
|
@ -12,7 +12,7 @@ |
|
|
|
<ProjectReference Include="..\..\src\Volo.Abp.BlobStoring.Aliyun\Volo.Abp.BlobStoring.Aliyun.csproj" /> |
|
|
|
<ProjectReference Include="..\..\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" /> |
|
|
|
<ProjectReference Include="..\AbpTestBase\AbpTestBase.csproj" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" /> |
|
|
|
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftPackageVersion)" /> |
|
|
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="$(MicrosoftNETTestSdkPackageVersion)" /> |
|
|
|
<ProjectReference Include="..\Volo.Abp.BlobStoring.Tests\Volo.Abp.BlobStoring.Tests.csproj" /> |
|
|
|
</ItemGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -1,7 +1,7 @@ |
|
|
|
<Project Sdk="Microsoft.NET.Sdk"> |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
<UserSecretsId>9f0d2c00-80c1-435b-bfab-2c39c8249091</UserSecretsId> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssemblyName>Volo.Abp.Caching.Tests</AssemblyName> |
|
|
|
<PackageId>Volo.Abp.Caching.Tests</PackageId> |
|
|
|
<RootNamespace /> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback> |
|
|
|
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles> |
|
|
|
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects> |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -13,4 +13,9 @@ public class UnitTestModelCacheKeyFactory : IModelCacheKeyFactory |
|
|
|
{ |
|
|
|
return context; |
|
|
|
} |
|
|
|
|
|
|
|
public virtual object Create(DbContext context, bool designTime) |
|
|
|
{ |
|
|
|
return context; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -3,7 +3,7 @@ |
|
|
|
<Import Project="..\..\..\common.test.props" /> |
|
|
|
|
|
|
|
<PropertyGroup> |
|
|
|
<TargetFramework>net6.0</TargetFramework> |
|
|
|
<TargetFramework>net7.0</TargetFramework> |
|
|
|
<RootNamespace /> |
|
|
|
</PropertyGroup> |
|
|
|
|
|
|
|
|